nir: improvements to native_integers removal

[mesa.git] / src / mesa / program / prog_statevars.h

diff --git a/src/mesa/program/prog_statevars.h b/src/mesa/program/prog_statevars.h
index 3fdb413c42104a16c1b2b53b1aacd9f372cbffa9..f28d2bb4a372fa2e4244dba36ceb2b09847bb61e 100644 (file)
--- a/src/mesa/program/prog_statevars.h
+++ b/src/mesa/program/prog_statevars.h
@@ -27,6 +27,7 @@
 
 
 #include "main/glheader.h"
+#include "compiler/shader_enums.h"
 
 
 #ifdef __cplusplus
@@ -37,12 +38,6 @@ extern "C" {
 struct gl_context;
 struct gl_program_parameter_list;
 
-/**
- * Number of STATE_* values we need to address any GL state.
- * Used to dimension arrays.
- */
-#define STATE_LENGTH 5
-
 
 /**
  * Used for describing GL state referenced from inside ARB vertex and
@@ -138,18 +133,17 @@ typedef enum gl_state_index_ {
 } gl_state_index;
 
 
-
 extern void
 _mesa_load_state_parameters(struct gl_context *ctx,
                             struct gl_program_parameter_list *paramList);
 
 
 extern GLbitfield
-_mesa_program_state_flags(const gl_state_index state[STATE_LENGTH]);
+_mesa_program_state_flags(const gl_state_index16 state[STATE_LENGTH]);
 
 
 extern char *
-_mesa_program_state_string(const gl_state_index state[STATE_LENGTH]);
+_mesa_program_state_string(const gl_state_index16 state[STATE_LENGTH]);