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

panfrost/midgard: Make search_var take a nir_shader and mode

Browse Source 
Alyssa Rosenzweig <alyssa.rosenzweig@collabora.com>

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5966>
This commit is contained in:
Jason Ekstrand
2020-07-20 16:07:11 -05:00
committed by Marge Bot
parent 568022be75
commit 94f0bae4de
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/panfrost/midgard/midgard_compile.c
View File

@@ -257,9 +257,9 @@ midgard_nir_lower_fdot2(nir_shader *shader)
} }
static const nir_variable * static const nir_variable *
search_var(struct exec_list *vars, unsigned driver_loc) search_var(nir_shader *nir, nir_variable_mode mode, unsigned driver_loc)
{ {
nir_foreach_variable(var, vars) { nir_foreach_variable_with_modes(var, nir, mode) {
if (var->data.driver_location == driver_loc) if (var->data.driver_location == driver_loc)
return var; return var;
} }
@@ -330,7 +330,7 @@ midgard_nir_lower_zs_store(nir_shader *nir)
if (intr->intrinsic != nir_intrinsic_store_output) if (intr->intrinsic != nir_intrinsic_store_output)
continue; continue;
const nir_variable *var = search_var(&nir->outputs, nir_intrinsic_base(intr)); const nir_variable *var = search_var(nir, nir_var_shader_out, nir_intrinsic_base(intr));
assert(var); assert(var);
if (var->data.location != FRAG_RESULT_COLOR && if (var->data.location != FRAG_RESULT_COLOR &&
@@ -469,7 +469,7 @@ midgard_nir_reorder_writeout(nir_shader *nir)
if (intr->intrinsic != nir_intrinsic_store_output) if (intr->intrinsic != nir_intrinsic_store_output)
continue; continue;
const nir_variable *var = search_var(&nir->outputs, nir_intrinsic_base(intr)); const nir_variable *var = search_var(nir, nir_var_shader_out, nir_intrinsic_base(intr));
if (var->data.index) { if (var->data.index) {
if (!last_writeout) if (!last_writeout)
@@ -1690,7 +1690,7 @@ output_load_rt_addr(compiler_context *ctx, nir_intrinsic_instr *instr)
return ctx->blend_rt; return ctx->blend_rt;
const nir_variable *var; const nir_variable *var;
var = search_var(&ctx->nir->outputs, nir_intrinsic_base(instr)); var = search_var(ctx->nir, nir_var_shader_out, nir_intrinsic_base(instr));
assert(var); assert(var);
unsigned loc = var->data.location; unsigned loc = var->data.location;
@@ -1899,7 +1899,7 @@ emit_intrinsic(compiler_context *ctx, nir_intrinsic_instr *instr)
nir_intrinsic_store_combined_output_pan; nir_intrinsic_store_combined_output_pan;
const nir_variable *var; const nir_variable *var;
var = search_var(&ctx->nir->outputs, var = search_var(ctx->nir, nir_var_shader_out,
nir_intrinsic_base(instr)); nir_intrinsic_base(instr));
assert(var); assert(var);