diff options
| author | Zack Rusin <zack@tungstengraphics.com> | 2008-05-19 12:10:42 -0400 |
|---|---|---|
| committer | Zack Rusin <zack@tungstengraphics.com> | 2008-05-19 12:10:42 -0400 |
| commit | 09900df42967a0ba61e78038304fd6c54934ad0d (patch) | |
| tree | 8bf72aa313a23c8554fdda5c9381cc593132722d /src/mesa/shader/program.c | |
| parent | 1c624846a81b0218b4a07328f485e295432c6312 (diff) | |
| parent | 59007a811de2d76ea00164e8f1cacb4a375d1458 (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-vertex-linear
Diffstat (limited to 'src/mesa/shader/program.c')
| -rw-r--r-- | src/mesa/shader/program.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index 9a23c5d7d3..e06ab5aa23 100644 --- a/src/mesa/shader/program.c +++ b/src/mesa/shader/program.c @@ -116,8 +116,6 @@ _mesa_free_program_data(GLcontext *ctx) } - - /** * Set the vertex/fragment program error state (position and error string). * This is generally called from within the parsers. @@ -272,6 +270,7 @@ _mesa_delete_program(GLcontext *ctx, struct gl_program *prog) { (void) ctx; ASSERT(prog); + ASSERT(prog->RefCount==0); if (prog == &_mesa_DummyProgram) return; @@ -391,7 +390,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) { - ctx->Driver.DeleteProgram(ctx, clone); + _mesa_reference_program(ctx, &clone, NULL); return NULL; } _mesa_copy_instructions(clone->Instructions, prog->Instructions, |