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

nir/lower_point_size: Use shader_instructions_pass

Browse Source 
Sleepy code deletion mood.

Signed-off-by: Alyssa Rosenzweig <alyssa@collabora.com>
Reviewed-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21750>
This commit is contained in:
Alyssa Rosenzweig
2023-03-06 19:19:41 -05:00
committed by Marge Bot
parent 933b5c76f6
commit 2ba48eea88
1 changed files with 21 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/compiler/nir/nir_lower_point_size.c
View File

@@ -32,31 +32,11 @@
* the driver must clamp the point size written by the shader manually to a * the driver must clamp the point size written by the shader manually to a
* valid range. * valid range.
*/ */
static void
lower_point_size_instr(nir_builder *b, nir_instr *psiz_instr,
float min, float max)
{
b->cursor = nir_before_instr(psiz_instr);
nir_intrinsic_instr *instr = nir_instr_as_intrinsic(psiz_instr);
assert(instr->src[1].is_ssa);
assert(instr->src[1].ssa->num_components == 1);
nir_ssa_def *psiz = instr->src[1].ssa;
if (min > 0.0f)
psiz = nir_fmax(b, psiz, nir_imm_float(b, min));
if (max > 0.0f)
psiz = nir_fmin(b, psiz, nir_imm_float(b, max));
nir_instr_rewrite_src(&instr->instr, &instr->src[1], nir_src_for_ssa(psiz));
}
static bool static bool
instr_is_point_size(const nir_instr *instr) lower_point_size_instr(nir_builder *b, nir_instr *instr, void *data)
{ {
float *minmax = (float *)data;
if (instr->type != nir_instr_type_intrinsic) if (instr->type != nir_instr_type_intrinsic)
return false; return false;
@@ -69,6 +49,20 @@ instr_is_point_size(const nir_instr *instr)
if (var->data.location != VARYING_SLOT_PSIZ) if (var->data.location != VARYING_SLOT_PSIZ)
return false; return false;
b->cursor = nir_before_instr(instr);
assert(intr->src[1].is_ssa);
assert(intr->src[1].ssa->num_components == 1);
nir_ssa_def *psiz = intr->src[1].ssa;
if (minmax[0] > 0.0f)
psiz = nir_fmax(b, psiz, nir_imm_float(b, minmax[0]));
if (minmax[1] > 0.0f)
psiz = nir_fmin(b, psiz, nir_imm_float(b, minmax[1]));
nir_instr_rewrite_src(instr, &intr->src[1], nir_src_for_ssa(psiz));
return true; return true;
} }
@@ -85,29 +79,8 @@ nir_lower_point_size(nir_shader *s, float min, float max)
assert(min > 0.0f || max > 0.0f); assert(min > 0.0f || max > 0.0f);
assert(min <= 0.0f || max <= 0.0f || min <= max); assert(min <= 0.0f || max <= 0.0f || min <= max);
bool progress = false; float minmax[] = {min, max};
nir_foreach_function(function, s) { return nir_shader_instructions_pass(s, lower_point_size_instr,
if (!function->impl)
continue;
nir_builder b;
nir_builder_init(&b, function->impl);
nir_foreach_block(block, function->impl) {
nir_foreach_instr_safe(instr, block) {
if (instr_is_point_size(instr)) {
lower_point_size_instr(&b, instr, min, max);
progress = true;
}
}
}
if (progress) {
nir_metadata_preserve(function->impl,
nir_metadata_block_index | nir_metadata_block_index |
nir_metadata_dominance); nir_metadata_dominance, minmax);
}
}
return progress;
} }