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

nir/lower_discard_to_demote: Use nir_shader_instructions_pass().

Browse Source 
Cleans up indentation, and clears the metadata tracking flag that would
break if this pass was used in in NIR_PASS().

Reviewed-By: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6412>
This commit is contained in:
Eric Anholt
2020-08-20 12:32:20 -07:00
committed by Marge Bot
parent 265dcb3836
commit 31f75aaeef
1 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
src/compiler/nir/nir_lower_discard_to_demote.c
View File

@@ -23,6 +23,31 @@
*/ */
#include "nir.h" #include "nir.h"
#include "nir_builder.h"
static bool
nir_lower_discard_to_demote_instr(nir_builder *b, nir_instr *instr, void *data)
{
if (instr->type != nir_instr_type_intrinsic)
return false;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_discard:
intrin->intrinsic = nir_intrinsic_demote;
b->shader->info.fs.uses_demote = true;
return true;
case nir_intrinsic_discard_if:
intrin->intrinsic = nir_intrinsic_demote_if;
b->shader->info.fs.uses_demote = true;
return true;
case nir_intrinsic_load_helper_invocation:
intrin->intrinsic = nir_intrinsic_is_helper_invocation;
return true;
default:
return false;
}
}
/** /**
* This pass is intended as workaround for game bugs to force correct * This pass is intended as workaround for game bugs to force correct
@@ -38,34 +63,8 @@ nir_lower_discard_to_demote(nir_shader *shader)
if (shader->info.stage != MESA_SHADER_FRAGMENT) if (shader->info.stage != MESA_SHADER_FRAGMENT)
return false; return false;
bool progress = false; return nir_shader_instructions_pass(shader,
nir_lower_discard_to_demote_instr,
nir_foreach_function(function, shader) { nir_metadata_all,
nir_foreach_block(block, function->impl) { NULL);
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
switch (intrin->intrinsic) {
case nir_intrinsic_discard:
intrin->intrinsic = nir_intrinsic_demote;
shader->info.fs.uses_demote = true;
break;
case nir_intrinsic_discard_if:
intrin->intrinsic = nir_intrinsic_demote_if;
shader->info.fs.uses_demote = true;
break;
case nir_intrinsic_load_helper_invocation:
intrin->intrinsic = nir_intrinsic_is_helper_invocation;
break;
default:
continue;
}
progress = true;
}
}
}
return progress;
} }