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

iris: Fix SLM

Browse Source 
Now that Jason has set up the L3 we can do this.  Also, my assert was
useless because we hadn't set up the field in the first place.  Oops.
This commit is contained in:
Kenneth Graunke
2018-11-19 11:22:56 -08:00
parent f9c5e277ac
commit 1b69b14c2a
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1138,6 +1138,8 @@ iris_compile_cs(struct iris_context *ice,
cs_prog_data->binding_table.work_groups_start = 0; cs_prog_data->binding_table.work_groups_start = 0;
prog_data->total_shared = nir->info.cs.shared_size;
iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values, iris_setup_uniforms(compiler, mem_ctx, nir, prog_data, &system_values,
&num_system_values); &num_system_values);

3
src/gallium/drivers/iris/iris_state.c
View File

@@ -4514,9 +4514,6 @@ iris_upload_compute_state(struct iris_context *ice,
struct brw_stage_prog_data *prog_data = shader->prog_data; struct brw_stage_prog_data *prog_data = shader->prog_data;
struct brw_cs_prog_data *cs_prog_data = (void *) prog_data; struct brw_cs_prog_data *cs_prog_data = (void *) prog_data;
// XXX: L3 configuration not set up for SLM
assert(prog_data->total_shared == 0);
if ((dirty & IRIS_DIRTY_CONSTANTS_CS) && shs->cbuf0_needs_upload) if ((dirty & IRIS_DIRTY_CONSTANTS_CS) && shs->cbuf0_needs_upload)
upload_uniforms(ice, MESA_SHADER_COMPUTE); upload_uniforms(ice, MESA_SHADER_COMPUTE);