aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/main/state.c
diff options
context:
space:
mode:
authorBrian Paul <[email protected]>2003-01-14 04:55:45 +0000
committerBrian Paul <[email protected]>2003-01-14 04:55:45 +0000
commit610d59981a9f43fefe29b34ef19c184d28e2bef5 (patch)
tree6bac42c2fd25b19ed35260538c6d945de8d699d8 /src/mesa/main/state.c
parentcf01d97dc3e23af067dd9633a2bfa61a6a794ce6 (diff)
First batch of code for GL_NV_fragment_program.
Re-org of some GL_NV_vertex_program code. Replace MAX_TEXTURE_UNITS with MAX_TEXTURE_COORD_UNITS and MAX_TEXTURE_IMAGE_UNITS.
Diffstat (limited to 'src/mesa/main/state.c')
-rw-r--r--src/mesa/main/state.c21
1 files changed, 18 insertions, 3 deletions
diff --git a/src/mesa/main/state.c b/src/mesa/main/state.c
index 2b11d9b26a6..14b62bc434d 100644
--- a/src/mesa/main/state.c
+++ b/src/mesa/main/state.c
@@ -1,4 +1,4 @@
-/* $Id: state.c,v 1.97 2002/11/06 15:16:23 brianp Exp $ */
+/* $Id: state.c,v 1.98 2003/01/14 04:55:46 brianp Exp $ */
/*
* Mesa 3-D graphics library
@@ -66,8 +66,8 @@
#include "texstate.h"
#include "mtypes.h"
#include "varray.h"
-#if FEATURE_NV_vertex_program
-#include "vpstate.h"
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
+#include "nvprogram.h"
#endif
#include "math/m_matrix.h"
@@ -504,6 +504,21 @@ _mesa_init_exec_table(struct _glapi_table *exec, GLuint tableSize)
exec->VertexAttribPointerNV = _mesa_VertexAttribPointerNV;
#endif
+#if 0 && FEATURE_NV_fragment_program
+ exec->ProgramNamedParameter4fNV = _mesa_ProgramNamedParameter4fNV;
+ exec->ProgramNamedParameter4dNV = _mesa_ProgramNamedParameter4dNV;
+ exec->ProgramNamedParameter4fvNV = _mesa_ProgramNamedParameter4fvNV;
+ exec->ProgramNamedParameter4dvNV = _mesa_ProgramNamedParameter4dvNV;
+ exec->GetProgramNamedParameterfvNV = _mesa_GetProgramNamedParameterfvNV;
+ exec->GetProgramNamedParameterdvNV = _mesa_GetProgramNamedParameterdvNV;
+ exec->ProgramLocalParameter4dARB = _mesa_ProgramLocalParameter4dARB;
+ exec->ProgramLocalParameter4dvARB = _mesa_ProgramLocalParameter4dvARB;
+ exec->ProgramLocalParameter4fARB = _mesa_ProgramLocalParameter4fARB;
+ exec->ProgramLocalParameter4fvARB = _mesa_ProgramLocalParameter4fvARB;
+ exec->GetProgramLocalParameterdvARB = _mesa_GetProgramLocalParameterdvARB;
+ exec->GetProgramLocalParameterfvARB = _mesa_GetProgramLocalParameterfvARB;
+#endif
+
/* 262. GL_NV_point_sprite */
exec->PointParameteriNV = _mesa_PointParameteriNV;
exec->PointParameterivNV = _mesa_PointParameterivNV;