Browse Source

use ctx->Driver.DeleteProgram() in a few more places

tags/mesa_7_1_rc1
Brian 17 years ago
parent
commit
dc6fab90b4
2 changed files with 4 additions and 4 deletions
  1. 1
    1
      src/mesa/shader/program.c
  2. 3
    3
      src/mesa/shader/shader_api.c

+ 1
- 1
src/mesa/shader/program.c View File

@@ -386,7 +386,7 @@ _mesa_clone_program(GLcontext *ctx, const struct gl_program *prog)
clone->Format = prog->Format;
clone->Instructions = _mesa_alloc_instructions(prog->NumInstructions);
if (!clone->Instructions) {
_mesa_delete_program(ctx, clone);
ctx->Driver.DeleteProgram(ctx, clone);
return NULL;
}
_mesa_copy_instructions(clone->Instructions, prog->Instructions,

+ 3
- 3
src/mesa/shader/shader_api.c View File

@@ -79,7 +79,7 @@ _mesa_clear_shader_program_data(GLcontext *ctx,
/* to prevent a double-free in the next call */
shProg->VertexProgram->Base.Parameters = NULL;
}
_mesa_delete_program(ctx, &shProg->VertexProgram->Base);
ctx->Driver.DeleteProgram(ctx, &shProg->VertexProgram->Base);
shProg->VertexProgram = NULL;
}

@@ -88,7 +88,7 @@ _mesa_clear_shader_program_data(GLcontext *ctx,
/* to prevent a double-free in the next call */
shProg->FragmentProgram->Base.Parameters = NULL;
}
_mesa_delete_program(ctx, &shProg->FragmentProgram->Base);
ctx->Driver.DeleteProgram(ctx, &shProg->FragmentProgram->Base);
shProg->FragmentProgram = NULL;
}

@@ -246,7 +246,7 @@ _mesa_free_shader(GLcontext *ctx, struct gl_shader *sh)
_mesa_free(sh->InfoLog);
for (i = 0; i < sh->NumPrograms; i++) {
assert(sh->Programs[i]);
_mesa_delete_program(ctx, sh->Programs[i]);
ctx->Driver.DeleteProgram(ctx, sh->Programs[i]);
}
if (sh->Programs)
_mesa_free(sh->Programs);

Loading…
Cancel
Save