From bdaff25c2041a2399ee4d4b08764baa890531e22 Mon Sep 17 00:00:00 2001 From: Timothy Arceri Date: Wed, 3 May 2017 15:56:03 +1000 Subject: [PATCH] mesa: small _mesa_UseProgram() tidy up Makes the code easier to follow. Reviewed-by: Eric Anholt --- src/mesa/main/shaderapi.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c index c41f006eb79..681b7306d13 100644 --- a/src/mesa/main/shaderapi.c +++ b/src/mesa/main/shaderapi.c @@ -1856,7 +1856,7 @@ void GLAPIENTRY _mesa_UseProgram(GLuint program) { GET_CURRENT_CONTEXT(ctx); - struct gl_shader_program *shProg; + struct gl_shader_program *shProg = NULL; if (MESA_VERBOSE & VERBOSE_API) _mesa_debug(ctx, "glUseProgram %u\n", program); @@ -1883,9 +1883,6 @@ _mesa_UseProgram(GLuint program) print_shader_info(shProg); } } - else { - shProg = NULL; - } /* The ARB_separate_shader_object spec says: * -- 2.30.2