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

i965: Move nir_lower_deref_instrs to right before locals_to_regs

Browse Source 
Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-03-19 18:00:14 -07:00
parent a649610ace
commit 152057b138
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/intel/blorp/blorp.c
View File

@@ -204,7 +204,6 @@ blorp_compile_fs(struct blorp_context *blorp, void *mem_ctx,
*/ */
wm_prog_data->base.binding_table.texture_start = BLORP_TEXTURE_BT_INDEX; wm_prog_data->base.binding_table.texture_start = BLORP_TEXTURE_BT_INDEX;
nir_lower_deref_instrs(nir, ~0);
nir = brw_preprocess_nir(compiler, nir); nir = brw_preprocess_nir(compiler, nir);
nir_remove_dead_variables(nir, nir_var_shader_in); nir_remove_dead_variables(nir, nir_var_shader_in);
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));
@@ -234,7 +233,6 @@ blorp_compile_vs(struct blorp_context *blorp, void *mem_ctx,
nir->options = nir->options =
compiler->glsl_compiler_options[MESA_SHADER_VERTEX].NirOptions; compiler->glsl_compiler_options[MESA_SHADER_VERTEX].NirOptions;
nir_lower_deref_instrs(nir, ~0);
nir = brw_preprocess_nir(compiler, nir); nir = brw_preprocess_nir(compiler, nir);
nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir));

2
src/intel/compiler/brw_nir.c
View File

@@ -766,6 +766,8 @@ brw_postprocess_nir(nir_shader *nir, const struct brw_compiler *compiler,
OPT(nir_opt_dce); OPT(nir_opt_dce);
OPT(nir_opt_move_comparisons); OPT(nir_opt_move_comparisons);
OPT(nir_lower_deref_instrs, ~0);
OPT(nir_lower_locals_to_regs); OPT(nir_lower_locals_to_regs);
if (unlikely(debug_enabled)) { if (unlikely(debug_enabled)) {

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

@@ -79,10 +79,10 @@ brw_create_nir(struct brw_context *brw,
if (shader_prog) { if (shader_prog) {
if (shader_prog->data->spirv) { if (shader_prog->data->spirv) {
nir = _mesa_spirv_to_nir(ctx, shader_prog, stage, options); nir = _mesa_spirv_to_nir(ctx, shader_prog, stage, options);
nir_lower_deref_instrs(nir, ~0); nir_lower_deref_instrs(nir, nir_lower_texture_derefs);
} else { } else {
nir = glsl_to_nir(shader_prog, stage, options); nir = glsl_to_nir(shader_prog, stage, options);
nir_lower_deref_instrs(nir, ~0); nir_lower_deref_instrs(nir, nir_lower_texture_derefs);
} }
assert (nir); assert (nir);
@@ -93,7 +93,6 @@ brw_create_nir(struct brw_context *brw,
nir_shader_get_entrypoint(nir), true, false); nir_shader_get_entrypoint(nir), true, false);
} else { } else {
nir = prog_to_nir(prog, options); nir = prog_to_nir(prog, options);
nir_lower_deref_instrs(nir, ~0);
NIR_PASS_V(nir, nir_lower_regs_to_ssa); /* turn registers into SSA */ NIR_PASS_V(nir, nir_lower_regs_to_ssa); /* turn registers into SSA */
} }
nir_validate_shader(nir); nir_validate_shader(nir);