diff options
| author | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-31 18:52:47 +0000 |
|---|---|---|
| committer | Brian Paul <brian.paul@tungstengraphics.com> | 2003-08-31 18:52:47 +0000 |
| commit | 04a81da03bef5020d863e46aa597eddf7aaac016 (patch) | |
| tree | 714f54ed6a4a5b74a17194cce98047e6a60dca1a /src/mesa/main/dlist.c | |
| parent | e38a55ecb27562a52d48bf1d673803a10d8a5bce (diff) | |
Moved some shared vertex/fragment program code into new program.c file.
Implemented new program_parameter_list type and functions for dealing with
named program parameters, constants and GL state references.
New state_index enum for describing GL state referenced within ARB vertex/
fragment programs. Plus, functions for fetching named GL state.
Diffstat (limited to 'src/mesa/main/dlist.c')
| -rw-r--r-- | src/mesa/main/dlist.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/mesa/main/dlist.c b/src/mesa/main/dlist.c index abfc2dfff8..36809fbe57 100644 --- a/src/mesa/main/dlist.c +++ b/src/mesa/main/dlist.c @@ -34,6 +34,7 @@ #include "config.h" #if FEATURE_ARB_vertex_program || FEATURE_ARB_fragment_program #include "arbprogram.h" +#include "program.h" #endif #include "attrib.h" #include "blend.h" @@ -71,6 +72,7 @@ #include "varray.h" #if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program #include "nvprogram.h" +#include "program.h" #endif #include "math/m_matrix.h" @@ -6509,9 +6511,9 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize ) * VertexAttribPointerNV, GetProgram*, GetVertexAttrib* */ table->BindProgramNV = save_BindProgramNV; - table->DeleteProgramsNV = _mesa_DeleteProgramsNV; + table->DeleteProgramsNV = _mesa_DeletePrograms; table->ExecuteProgramNV = save_ExecuteProgramNV; - table->GenProgramsNV = _mesa_GenProgramsNV; + table->GenProgramsNV = _mesa_GenPrograms; table->AreProgramsResidentNV = _mesa_AreProgramsResidentNV; table->RequestResidentProgramsNV = save_RequestResidentProgramsNV; table->GetProgramParameterfvNV = _mesa_GetProgramParameterfvNV; @@ -6523,7 +6525,7 @@ _mesa_init_dlist_table( struct _glapi_table *table, GLuint tableSize ) table->GetVertexAttribfvNV = _mesa_GetVertexAttribfvNV; table->GetVertexAttribivNV = _mesa_GetVertexAttribivNV; table->GetVertexAttribPointervNV = _mesa_GetVertexAttribPointervNV; - table->IsProgramNV = _mesa_IsProgramNV; + table->IsProgramNV = _mesa_IsProgram; table->LoadProgramNV = save_LoadProgramNV; table->ProgramParameter4dNV = save_ProgramParameter4dNV; table->ProgramParameter4dvNV = save_ProgramParameter4dvNV; |