OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Reviewed-by: Brian Paul <brianp@vmware.com>
This commit is contained in:
Marek Olšák
2017-11-16 16:19:22 +01:00
parent f4ea2b2a9e
commit 6b1e26e181
5 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/compiler/glsl/ir.h
View File

@@ -397,7 +397,7 @@ depth_layout_string(ir_depth_layout layout);
* \sa ir_variable::state_slots * \sa ir_variable::state_slots
*/ */
struct ir_state_slot { struct ir_state_slot {
gl_state_index16 tokens[5]; gl_state_index16 tokens[STATE_LENGTH];
int swizzle; int swizzle;
}; };

10
src/compiler/nir/nir.h
View File

@@ -89,7 +89,7 @@ struct nir_instr;
* \sa nir_variable::state_slots * \sa nir_variable::state_slots
*/ */
typedef struct { typedef struct {
gl_state_index16 tokens[5]; gl_state_index16 tokens[STATE_LENGTH];
int swizzle; int swizzle;
} nir_state_slot; } 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); void nir_lower_tes_patch_vertices(nir_shader *tes, unsigned patch_vertices);
typedef struct nir_lower_wpos_ytransform_options { 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_upper_left :1;
bool fs_coord_origin_lower_left :1; bool fs_coord_origin_lower_left :1;
bool fs_coord_pixel_center_integer :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); bool nir_lower_wpos_center(nir_shader *shader, const bool for_sample_shading);
typedef struct nir_lower_drawpixels_options { typedef struct nir_lower_drawpixels_options {
gl_state_index16 texcoord_state_tokens[5]; gl_state_index16 texcoord_state_tokens[STATE_LENGTH];
gl_state_index16 scale_state_tokens[5]; gl_state_index16 scale_state_tokens[STATE_LENGTH];
gl_state_index16 bias_state_tokens[5]; gl_state_index16 bias_state_tokens[STATE_LENGTH];
unsigned drawpix_sampler; unsigned drawpix_sampler;
unsigned pixelmap_sampler; unsigned pixelmap_sampler;
bool pixel_maps :1; bool pixel_maps :1;

2
src/compiler/nir/nir_lower_drawpixels.c
View File

@@ -68,7 +68,7 @@ get_texcoord(lower_drawpixels_state *state)
static nir_variable * static nir_variable *
create_uniform(nir_shader *shader, const char *name, 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_variable *var = nir_variable_create(shader,
nir_var_uniform, nir_var_uniform,

6
src/compiler/shader_enums.h
View File

@@ -48,6 +48,12 @@ typedef enum
MESA_SHADER_COMPUTE = 5, MESA_SHADER_COMPUTE = 5,
} gl_shader_stage; } 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 */ typedef short gl_state_index16; /* see enum gl_state_index */
const char *gl_shader_stage_name(gl_shader_stage stage); const char *gl_shader_stage_name(gl_shader_stage stage);

6
src/mesa/program/prog_statevars.h
View File

@@ -37,12 +37,6 @@ extern "C" {
struct gl_context; struct gl_context;
struct gl_program_parameter_list; 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 * Used for describing GL state referenced from inside ARB vertex and