summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/program.h
diff options
context:
space:
mode:
authorKarl Rasche <[email protected]>2003-09-23 00:45:56 +0000
committerKarl Rasche <[email protected]>2003-09-23 00:45:56 +0000
commitd11bb2b297a69878a50bf135e9d1f96ce6d3d65d (patch)
treea8b1abdd0e1e85097624f62c02a43e9a8c2115ab /src/mesa/main/program.h
parentf3a63d69ff02a525ebe4c927b5d055c6598d62bf (diff)
Add extra cases and enums for _mesa_fetch_state(), and set the length of
program_parameter.StateIndexes[] to 6, used for fetching matrix state
Diffstat (limited to 'src/mesa/main/program.h')
-rw-r--r--src/mesa/main/program.h17
1 files changed, 14 insertions, 3 deletions
diff --git a/src/mesa/main/program.h b/src/mesa/main/program.h
index 70982c53404..ac107d9e372 100644
--- a/src/mesa/main/program.h
+++ b/src/mesa/main/program.h
@@ -101,6 +101,7 @@ enum state_index {
STATE_SPECULAR,
STATE_EMISSION,
STATE_SHININESS,
+ STATE_HALF,
STATE_POSITION,
STATE_ATTENUATION,
@@ -113,7 +114,17 @@ enum state_index {
STATE_TEXGEN_OBJECT_S,
STATE_TEXGEN_OBJECT_T,
STATE_TEXGEN_OBJECT_R,
- STATE_TEXGEN_OBJECT_Q
+ STATE_TEXGEN_OBJECT_Q,
+
+ STATE_TEXENV_COLOR,
+
+ STATE_DEPTH_RANGE,
+
+ STATE_VERTEX_PROGRAM,
+ STATE_FRAGMENT_PROGRAM,
+
+ STATE_ENV,
+ STATE_LOCAL
};
@@ -137,7 +148,7 @@ struct program_parameter
{
const char *Name; /* Null-terminated */
enum parameter_type Type;
- enum state_index StateIndexes[5]; /* Global state reference */
+ enum state_index StateIndexes[6]; /* Global state reference */
GLfloat Values[4];
};
@@ -176,7 +187,7 @@ _mesa_add_unnamed_constant(struct program_parameter_list *paramList,
extern GLint
_mesa_add_state_reference(struct program_parameter_list *paramList,
- const char *stateString);
+ GLint *stateTokens);
extern GLfloat *
_mesa_lookup_parameter_value(struct program_parameter_list *paramList,