AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iris: Pass devinfo directly in iris_setup_uniforms

Browse Source 
Instead of reaching through brw_compiler.  This will make easy
future changes on brw_compiler side.

Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19836>
This commit is contained in:
Caio Oliveira
2022-11-17 16:16:06 -08:00
committed by Marge Bot
parent a9602134a3
commit d989746e55
1 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/gallium/drivers/iris/iris_program.c
View File

@@ -466,7 +466,7 @@ setup_vec4_image_sysval(uint32_t *sysvals, uint32_t idx,
* ideal situation (though the backend can reduce this).
*/
static void
iris_setup_uniforms(const struct brw_compiler *compiler,
iris_setup_uniforms(ASSERTED const struct intel_device_info *devinfo,
void *mem_ctx,
nir_shader *nir,
struct brw_stage_prog_data *prog_data,
@@ -475,8 +475,6 @@ iris_setup_uniforms(const struct brw_compiler *compiler,
unsigned *out_num_system_values,
unsigned *out_num_cbufs)
{
UNUSED const struct intel_device_info *devinfo = compiler->devinfo;
unsigned system_values_start = ALIGN(kernel_input_size, sizeof(uint32_t));
const unsigned IRIS_MAX_SYSTEM_VALUES =
@@ -1348,7 +1346,7 @@ iris_compile_vs(struct iris_screen *screen,
prog_data->use_alt_mode = nir->info.use_legacy_math_rules;
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, 0, &system_values,
iris_setup_uniforms(devinfo, mem_ctx, nir, prog_data, 0, &system_values,
&num_system_values, &num_cbufs);
struct iris_binding_table bt;
@@ -1523,7 +1521,7 @@ iris_compile_tcs(struct iris_screen *screen,
if (ish) {
nir = nir_shader_clone(mem_ctx, ish->nir);
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, 0, &system_values,
iris_setup_uniforms(devinfo, mem_ctx, nir, prog_data, 0, &system_values,
&num_system_values, &num_cbufs);
iris_setup_binding_table(devinfo, nir, &bt, /* num_render_targets */ 0,
num_system_values, num_cbufs);
@@ -1713,7 +1711,7 @@ iris_compile_tes(struct iris_screen *screen,
nir_shader_gather_info(nir, impl);
}
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, 0, &system_values,
iris_setup_uniforms(devinfo, mem_ctx, nir, prog_data, 0, &system_values,
&num_system_values, &num_cbufs);
struct iris_binding_table bt;
@@ -1852,7 +1850,7 @@ iris_compile_gs(struct iris_screen *screen,
nir_shader_gather_info(nir, impl);
}
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, 0, &system_values,
iris_setup_uniforms(devinfo, mem_ctx, nir, prog_data, 0, &system_values,
&num_system_values, &num_cbufs);
struct iris_binding_table bt;
@@ -1978,7 +1976,7 @@ iris_compile_fs(struct iris_screen *screen,
prog_data->use_alt_mode = nir->info.use_legacy_math_rules;
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, 0, &system_values,
iris_setup_uniforms(devinfo, mem_ctx, nir, prog_data, 0, &system_values,
&num_system_values, &num_cbufs);
/* Lower output variables to load_output intrinsics before setting up
@@ -2270,7 +2268,7 @@ iris_compile_cs(struct iris_screen *screen,
NIR_PASS_V(nir, brw_nir_lower_cs_intrinsics);
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data,
iris_setup_uniforms(devinfo, mem_ctx, nir, prog_data,
ish->kernel_input_size,
&system_values, &num_system_values, &num_cbufs);