summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimothy Arceri <[email protected]>2017-05-03 15:56:03 +1000
committerTimothy Arceri <[email protected]>2017-05-11 10:56:09 +1000
commitbdaff25c2041a2399ee4d4b08764baa890531e22 (patch)
tree75f3cc6573b5068b3616cf54aa3879b50f869051
parent244cef1694fbeb6738b883afc2ca6c4cc9c05ff0 (diff)
mesa: small _mesa_UseProgram() tidy up
Makes the code easier to follow. Reviewed-by: Eric Anholt <[email protected]>
-rw-r--r--src/mesa/main/shaderapi.c5
1 files changed, 1 insertions, 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:
*