diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2004-10-02 15:16:59 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2004-10-02 15:16:59 +0000 |
| commit | 9ca83924848070d02a5ac2f0aa4e20444eec2183 (patch) | |
| tree | c1379d31e2aab19bc05270a833fdd25783627641 /src/mesa/shader/program.c | |
| parent | 07dead7a51f1c35f3b6185ffba2afc09e24f6cdb (diff) | |
fix LoadProgramNV regression when I had fixed the RefCount bug
Diffstat (limited to 'src/mesa/shader/program.c')
| -rw-r--r-- | src/mesa/shader/program.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/shader/program.c b/src/mesa/shader/program.c index 7ec09b0256..88085f811a 100644 --- a/src/mesa/shader/program.c +++ b/src/mesa/shader/program.c @@ -49,7 +49,7 @@ /* A pointer to this dummy program is put into the hash table when * glGenPrograms is called. */ -static struct program DummyProgram; +struct program _mesa_DummyProgram; /** @@ -938,7 +938,7 @@ _mesa_BindProgram(GLenum target, GLuint id) else { /* Bind user program */ prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, id); - if (!prog || prog == &DummyProgram) { + if (!prog || prog == &_mesa_DummyProgram) { /* allocate a new program now */ prog = ctx->Driver.NewProgram(ctx, target, id); if (!prog) { @@ -995,7 +995,7 @@ _mesa_DeletePrograms(GLsizei n, const GLuint *ids) if (ids[i] != 0) { struct program *prog = (struct program *) _mesa_HashLookup(ctx->Shared->Programs, ids[i]); - if (prog == &DummyProgram) { + if (prog == &_mesa_DummyProgram) { _mesa_HashRemove(ctx->Shared->Programs, ids[i]); } else if (prog) { @@ -1060,7 +1060,7 @@ _mesa_GenPrograms(GLsizei n, GLuint *ids) /* Insert pointer to dummy program as placeholder */ for (i = 0; i < (GLuint) n; i++) { - _mesa_HashInsert(ctx->Shared->Programs, first + i, &DummyProgram); + _mesa_HashInsert(ctx->Shared->Programs, first + i, &_mesa_DummyProgram); } /* Return the program names */ |