mesa: move STATE_LENGTH to shader_enums.h and use it everywhere

Reviewed-by: Brian Paul <brianp@vmware.com>

diff --git a/src/compiler/glsl/ir.h b/src/compiler/glsl/ir.h
index b849c938722c5e3b3fd86cda5328834c177b2f33..6d3ef89eb87559c0bb541d93bb9bef07930b4ec5 100644 (file)
--- a/src/compiler/glsl/ir.h
+++ b/src/compiler/glsl/ir.h
@@ -397,7 +397,7 @@ depth_layout_string(ir_depth_layout layout);
  * \sa ir_variable::state_slots
  */
 struct ir_state_slot {
-   gl_state_index16 tokens[5];
+   gl_state_index16 tokens[STATE_LENGTH];
    int swizzle;
 };
 

diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h
index 216cc8837fdc93b8ed58637b4a942860d60efae4..2acd9511f57db9b69d2ba0651fd877b82bf13c3e 100644 (file)
--- a/src/compiler/nir/nir.h
+++ b/src/compiler/nir/nir.h
@@ -89,7 +89,7 @@ struct nir_instr;
  * \sa nir_variable::state_slots
  */
 typedef struct {
-   gl_state_index16 tokens[5];
+   gl_state_index16 tokens[STATE_LENGTH];
    int swizzle;
 } nir_state_slot;
 
@@ -2653,7 +2653,7 @@ void nir_lower_passthrough_edgeflags(nir_shader *shader);
 void nir_lower_tes_patch_vertices(nir_shader *tes, unsigned patch_vertices);
 
 typedef struct nir_lower_wpos_ytransform_options {
-   gl_state_index16 state_tokens[5];
+   gl_state_index16 state_tokens[STATE_LENGTH];
    bool fs_coord_origin_upper_left :1;
    bool fs_coord_origin_lower_left :1;
    bool fs_coord_pixel_center_integer :1;
@@ -2665,9 +2665,9 @@ bool nir_lower_wpos_ytransform(nir_shader *shader,
 bool nir_lower_wpos_center(nir_shader *shader, const bool for_sample_shading);
 
 typedef struct nir_lower_drawpixels_options {
-   gl_state_index16 texcoord_state_tokens[5];
-   gl_state_index16 scale_state_tokens[5];
-   gl_state_index16 bias_state_tokens[5];
+   gl_state_index16 texcoord_state_tokens[STATE_LENGTH];
+   gl_state_index16 scale_state_tokens[STATE_LENGTH];
+   gl_state_index16 bias_state_tokens[STATE_LENGTH];
    unsigned drawpix_sampler;
    unsigned pixelmap_sampler;
    bool pixel_maps :1;

diff --git a/src/compiler/nir/nir_lower_drawpixels.c b/src/compiler/nir/nir_lower_drawpixels.c
index 4d43f423a49e4281a0d3d47a932372c5c383514b..5cc358d869f4f06505c1d8dee91f65287217f994 100644 (file)
--- a/src/compiler/nir/nir_lower_drawpixels.c
+++ b/src/compiler/nir/nir_lower_drawpixels.c
@@ -68,7 +68,7 @@ get_texcoord(lower_drawpixels_state *state)
 
 static nir_variable *
 create_uniform(nir_shader *shader, const char *name,
-               const gl_state_index16 state_tokens[5])
+               const gl_state_index16 state_tokens[STATE_LENGTH])
 {
    nir_variable *var = nir_variable_create(shader,
                                            nir_var_uniform,

diff --git a/src/compiler/shader_enums.h b/src/compiler/shader_enums.h
index d1e875bd189f02f8613a7fd80d2fe75d272e174d..ac83c65b30c7ea4788ec7f6913e80c8d00129af7 100644 (file)
--- a/src/compiler/shader_enums.h
+++ b/src/compiler/shader_enums.h
@@ -48,6 +48,12 @@ typedef enum
    MESA_SHADER_COMPUTE = 5,
 } gl_shader_stage;
 
+/**
+ * Number of STATE_* values we need to address any GL state.
+ * Used to dimension arrays.
+ */
+#define STATE_LENGTH 5
+
 typedef short gl_state_index16; /* see enum gl_state_index */
 
 const char *gl_shader_stage_name(gl_shader_stage stage);

diff --git a/src/mesa/program/prog_statevars.h b/src/mesa/program/prog_statevars.h
index 6d3cc94a0291ccf446970ac4953a80f227f692b8..6cb3531233c4434ba188ac552a038b2475e4a2d2 100644 (file)
--- a/src/mesa/program/prog_statevars.h
+++ b/src/mesa/program/prog_statevars.h
@@ -37,12 +37,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