mesa: avoid valgrind warning due to opaque only being set sometimes

[mesa.git] / src / mesa / main / shaderapi.c

diff --git a/src/mesa/main/shaderapi.c b/src/mesa/main/shaderapi.c
index c5c502466e55da0e0ce9dcab2975ce9af6ffcacd..4f29cd974d039ef977208a1e88ee502da74f1e48 100644 (file)
--- a/src/mesa/main/shaderapi.c
+++ b/src/mesa/main/shaderapi.c
@@ -1094,7 +1094,7 @@ _mesa_link_program(struct gl_context *ctx, struct gl_shader_program *shProg)
 
    /* Capture .shader_test files. */
    const char *capture_path = _mesa_get_shader_capture_path();
-   if (shProg->Name != 0 && capture_path != NULL) {
+   if (shProg->Name != 0 && shProg->Name != ~0 && capture_path != NULL) {
       FILE *file;
       char filename[PATH_MAX];
 
@@ -1253,9 +1253,6 @@ _mesa_use_program(struct gl_context *ctx, struct gl_shader_program *shProg)
    for (i = 0; i < MESA_SHADER_STAGES; i++)
       use_shader_program(ctx, i, shProg, &ctx->Shader);
    _mesa_active_program(ctx, shProg, "glUseProgram");
-
-   if (ctx->Driver.UseProgram)
-      ctx->Driver.UseProgram(ctx, shProg);
 }
 
 
@@ -2145,9 +2142,6 @@ _mesa_use_shader_program(struct gl_context *ctx, GLenum type,
 {
    gl_shader_stage stage = _mesa_shader_enum_to_shader_stage(type);
    use_shader_program(ctx, stage, shProg, shTarget);
-
-   if (ctx->Driver.UseProgram)
-      ctx->Driver.UseProgram(ctx, shProg);
 }