diff options
| author | Marek Olšák <[email protected]> | 2017-11-16 16:19:22 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-02-13 01:00:45 +0100 |
| commit | 6b1e26e181fbe7fd64b42a0b77f80535be4d7690 (patch) | |
| tree | 93674f363d34126642d83d924a50cae23c83a15d /src/compiler/nir | |
| parent | f4ea2b2a9e99d93fbf36c3f0e5f6f384be3cdb89 (diff) | |
mesa: move STATE_LENGTH to shader_enums.h and use it everywhere
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/compiler/nir')
| -rw-r--r-- | src/compiler/nir/nir.h | 10 | ||||
| -rw-r--r-- | src/compiler/nir/nir_lower_drawpixels.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 216cc8837fd..2acd9511f57 100644 --- 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 4d43f423a49..5cc358d869f 100644 --- 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, |