Fix trigger happy warnings.

This commit is contained in:
Themaister 2012-05-27 18:40:07 +02:00
parent 9cd51921cb
commit 1b01a00e3e

View File

@ -158,18 +158,12 @@ static bool gl_shader_init(void)
#ifdef HAVE_CG #ifdef HAVE_CG
case RARCH_SHADER_CG: case RARCH_SHADER_CG:
{
return gl_cg_init(g_settings.video.cg_shader_path); return gl_cg_init(g_settings.video.cg_shader_path);
break;
}
#endif #endif
#ifdef HAVE_XML #ifdef HAVE_XML
case RARCH_SHADER_BSNES: case RARCH_SHADER_BSNES:
{
return gl_glsl_init(g_settings.video.bsnes_shader_path); return gl_glsl_init(g_settings.video.bsnes_shader_path);
break;
}
#endif #endif
default: default:
@ -304,7 +298,7 @@ static void gl_create_fbo_textures(gl_t *gl)
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_BORDER);
GLuint filter_type = base_filt; GLuint filter_type = base_filt;
bool smooth; bool smooth = false;
if (gl_shader_filter_type(i + 2, &smooth)) if (gl_shader_filter_type(i + 2, &smooth))
filter_type = smooth ? GL_LINEAR : GL_NEAREST; filter_type = smooth ? GL_LINEAR : GL_NEAREST;