diff options
| author | Brian Paul <[email protected]> | 2004-01-30 23:36:35 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2004-01-30 23:36:35 +0000 |
| commit | 111156affeab383f6b6f4a1c104bcd5c14999ef7 (patch) | |
| tree | 3a1a57b333bd8b4824b03c52d12d5c19c5065058 /src/mesa/main/dlist.c | |
| parent | 26baf96beae8cfad312365276c8f371b4c233d99 (diff) | |
glBindProgramARB wasn't getting compiled into display lists (bug 887383)
Diffstat (limited to 'src/mesa/main/dlist.c')
| -rw-r--r-- | src/mesa/main/dlist.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index 539e654184a..aada62d1f9f 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -4128,7 +4128,7 @@ save_PixelTexGenParameterfvSGIS(GLenum target, const GLfloat *value) /* * GL_NV_vertex_program */ -#if FEATURE_NV_vertex_program +#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program static void GLAPIENTRY save_BindProgramNV(GLenum target, GLuint id) { @@ -4144,7 +4144,9 @@ save_BindProgramNV(GLenum target, GLuint id) (*ctx->Exec->BindProgramNV)( target, id ); } } +#endif /* FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program */ +#if FEATURE_NV_vertex_program static void GLAPIENTRY save_ExecuteProgramNV(GLenum target, GLuint id, const GLfloat *params) { @@ -5874,10 +5876,12 @@ execute_list( GLcontext *ctx, GLuint list ) case OPCODE_WINDOW_POS_ARB: /* GL_ARB_window_pos */ (*ctx->Exec->WindowPos3fMESA)( n[1].f, n[2].f, n[3].f ); break; -#if FEATURE_NV_vertex_program +#if FEATURE_NV_vertex_program || FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program case OPCODE_BIND_PROGRAM_NV: /* GL_NV_vertex_program */ (*ctx->Exec->BindProgramNV)( n[1].e, n[2].ui ); break; +#endif +#if FEATURE_NV_vertex_program case OPCODE_EXECUTE_PROGRAM_NV: { GLfloat v[4]; @@ -7448,7 +7452,7 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize ) table->EnableVertexAttribArrayARB = _mesa_EnableVertexAttribArrayARB; table->DisableVertexAttribArrayARB = _mesa_DisableVertexAttribArrayARB; table->ProgramStringARB = save_ProgramStringARB; - table->BindProgramNV = _mesa_BindProgram; + table->BindProgramNV = save_BindProgramNV; table->DeleteProgramsNV = _mesa_DeletePrograms; table->GenProgramsNV = _mesa_GenPrograms; table->IsProgramNV = _mesa_IsProgram; |