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

nir: handle output beeing written to deref in nir_lower_point_smooth

Browse Source 
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21731>
This commit is contained in:
antonino
2023-03-06 12:17:14 +01:00
committed by Marge Bot
parent 4b07182c8c
commit 3a59b2a670
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/compiler/nir/nir_lower_point_smooth.c
View File

@@ -39,15 +39,27 @@ lower_point_smooth(nir_builder *b, nir_instr *instr, UNUSED void *_state)
nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr); nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
if (intr->intrinsic != nir_intrinsic_store_output) if (intr->intrinsic != nir_intrinsic_store_output &&
intr->intrinsic != nir_intrinsic_store_deref)
return false; return false;
int location = nir_intrinsic_io_semantics(intr).location; int out_src_idx;
if ((location != FRAG_RESULT_COLOR && location < FRAG_RESULT_DATA0) || if (intr->intrinsic == nir_intrinsic_store_output) {
nir_intrinsic_src_type(intr) != nir_type_float32) int location = nir_intrinsic_io_semantics(intr).location;
return false; if ((location != FRAG_RESULT_COLOR && location < FRAG_RESULT_DATA0) ||
nir_intrinsic_src_type(intr) != nir_type_float32)
return false;
out_src_idx = 0;
} else {
nir_variable *var = nir_intrinsic_get_var(intr, 0);
if ((var->data.location != FRAG_RESULT_COLOR &&
var->data.location < FRAG_RESULT_DATA0) ||
glsl_get_base_type(var->type) != GLSL_TYPE_FLOAT)
return false;
out_src_idx = 1;
}
assert(intr->src[0].is_ssa); assert(intr->src[out_src_idx].is_ssa);
assert(intr->num_components == 4); assert(intr->num_components == 4);
b->cursor = nir_before_instr(&intr->instr); b->cursor = nir_before_instr(&intr->instr);
@@ -77,8 +89,8 @@ lower_point_smooth(nir_builder *b, nir_instr *instr, UNUSED void *_state)
/* Write out the fragment color*vec4(1, 1, 1, coverage)*/ /* Write out the fragment color*vec4(1, 1, 1, coverage)*/
nir_ssa_def *one = nir_imm_float(b, 1.0f); nir_ssa_def *one = nir_imm_float(b, 1.0f);
nir_ssa_def *new_val = nir_fmul(b, nir_vec4(b, one, one, one, coverage), nir_ssa_def *new_val = nir_fmul(b, nir_vec4(b, one, one, one, coverage),
intr->src[0].ssa); intr->src[out_src_idx].ssa);
nir_instr_rewrite_src(instr, &intr->src[0], nir_src_for_ssa(new_val)); nir_instr_rewrite_src(instr, &intr->src[out_src_idx], nir_src_for_ssa(new_val));
return true; return true;
} }