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

intel: Move brw_prog_key_set_id from i965 to the compiler.

Browse Source 
I want to use it in iris.

Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:
Kenneth Graunke
2019-05-20 11:24:21 -07:00
parent b589c2547d
commit 419d9b21e1
4 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/intel/compiler/brw_compiler.c
View File

@@ -262,3 +262,20 @@ brw_prog_key_size(gl_shader_stage stage)
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_sizes)); assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_sizes));
return stage_sizes[stage]; return stage_sizes[stage];
} }
void
brw_prog_key_set_id(union brw_any_prog_key *key,
gl_shader_stage stage,
unsigned id)
{
static const unsigned stage_offsets[] = {
offsetof(struct brw_vs_prog_key, program_string_id),
offsetof(struct brw_tcs_prog_key, program_string_id),
offsetof(struct brw_tes_prog_key, program_string_id),
offsetof(struct brw_gs_prog_key, program_string_id),
offsetof(struct brw_wm_prog_key, program_string_id),
offsetof(struct brw_cs_prog_key, program_string_id),
};
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_offsets));
*(unsigned*)((uint8_t*)key + stage_offsets[stage]) = id;
}

3
src/intel/compiler/brw_compiler.h
View File

@@ -1230,6 +1230,9 @@ brw_prog_data_size(gl_shader_stage stage);
unsigned unsigned
brw_prog_key_size(gl_shader_stage stage); brw_prog_key_size(gl_shader_stage stage);
void
brw_prog_key_set_id(union brw_any_prog_key *key, gl_shader_stage, unsigned id);
/** /**
* Compile a vertex shader. * Compile a vertex shader.
* *

16
src/mesa/drivers/dri/i965/brw_program.c
View File

@@ -868,22 +868,6 @@ brw_assign_common_binding_table_offsets(const struct gen_device_info *devinfo,
return next_binding_table_offset; return next_binding_table_offset;
} }
void
brw_prog_key_set_id(union brw_any_prog_key *key, gl_shader_stage stage,
unsigned id)
{
static const unsigned stage_offsets[] = {
offsetof(struct brw_vs_prog_key, program_string_id),
offsetof(struct brw_tcs_prog_key, program_string_id),
offsetof(struct brw_tes_prog_key, program_string_id),
offsetof(struct brw_gs_prog_key, program_string_id),
offsetof(struct brw_wm_prog_key, program_string_id),
offsetof(struct brw_cs_prog_key, program_string_id),
};
assert((int)stage >= 0 && stage < ARRAY_SIZE(stage_offsets));
*(unsigned*)((uint8_t*)key + stage_offsets[stage]) = id;
}
void void
brw_populate_default_key(const struct brw_compiler *compiler, brw_populate_default_key(const struct brw_compiler *compiler,
union brw_any_prog_key *prog_key, union brw_any_prog_key *prog_key,

4
src/mesa/drivers/dri/i965/brw_program.h
View File

@@ -81,10 +81,6 @@ brw_assign_common_binding_table_offsets(const struct gen_device_info *devinfo,
struct brw_stage_prog_data *stage_prog_data, struct brw_stage_prog_data *stage_prog_data,
uint32_t next_binding_table_offset); uint32_t next_binding_table_offset);
void
brw_prog_key_set_id(union brw_any_prog_key *key, gl_shader_stage stage,
unsigned id);
void void
brw_populate_default_key(const struct brw_compiler *compiler, brw_populate_default_key(const struct brw_compiler *compiler,
union brw_any_prog_key *prog_key, union brw_any_prog_key *prog_key,