summaryrefslogtreecommitdiff
path: root/src/mesa/main/context.c
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2003-08-31 18:52:47 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2003-08-31 18:52:47 +0000
commit04a81da03bef5020d863e46aa597eddf7aaac016 (patch)
tree714f54ed6a4a5b74a17194cce98047e6a60dca1a /src/mesa/main/context.c
parente38a55ecb27562a52d48bf1d673803a10d8a5bce (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/context.c')
-rw-r--r--src/mesa/main/context.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 8e5884a6cb..9151c74899 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -74,7 +74,6 @@
#include "glheader.h"
#include "imports.h"
#include "accum.h"
-#include "arbprogram.h"
#include "attrib.h"
#include "blend.h"
#include "buffers.h"
@@ -111,8 +110,8 @@
#include "texstate.h"
#include "mtypes.h"
#include "varray.h"
-#if FEATURE_NV_vertex_program
-#include "nvprogram.h"
+#if FEATURE_NV_vertex_program || FEATURE_NV_fragment_program
+#include "program.h"
#endif
#include "vtxfmt.h"
#if _HAVE_FULL_GL