diff options
| author | Marek Olšák <[email protected]> | 2017-11-16 04:29:35 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-02-13 01:00:45 +0100 |
| commit | e149a0253c12d103805230bc7bc0a36887c3b8df (patch) | |
| tree | 2eedb0e74a1d0f71c76634ac165f925feecfa1b3 /src/compiler/nir | |
| parent | a7882013d3e788a76cce638704c02b7bea0e67a1 (diff) | |
mesa,glsl,nir: reduce gl_state_index size to 2 bytes
Let's use the new gl_state_index16 type everywhere and remove
the typecasts.
This helps reduce the size of gl_program_parameter.
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 | 3 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/compiler/nir/nir.h b/src/compiler/nir/nir.h index 5ea8c9926b9..216cc8837fd 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 { - int tokens[5]; + gl_state_index16 tokens[5]; 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 { - int state_tokens[5]; + gl_state_index16 state_tokens[5]; 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 { - int texcoord_state_tokens[5]; - int scale_state_tokens[5]; - int bias_state_tokens[5]; + gl_state_index16 texcoord_state_tokens[5]; + gl_state_index16 scale_state_tokens[5]; + gl_state_index16 bias_state_tokens[5]; 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 acec9443431..4d43f423a49 100644 --- a/src/compiler/nir/nir_lower_drawpixels.c +++ b/src/compiler/nir/nir_lower_drawpixels.c @@ -67,7 +67,8 @@ get_texcoord(lower_drawpixels_state *state) } static nir_variable * -create_uniform(nir_shader *shader, const char *name, const int state_tokens[5]) +create_uniform(nir_shader *shader, const char *name, + const gl_state_index16 state_tokens[5]) { nir_variable *var = nir_variable_create(shader, nir_var_uniform, |