projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
glsl: don't drop instructions from unreachable terminators continue branch
[mesa.git]
/
src
/
compiler
/
nir
/
nir_lower_clamp_color_outputs.c
diff --git
a/src/compiler/nir/nir_lower_clamp_color_outputs.c
b/src/compiler/nir/nir_lower_clamp_color_outputs.c
index 68bfbed81aa9025064baa4317950e61b63d09dbd..cc497351eeee09cc2eb54763195f95e3a939a833 100644
(file)
--- a/
src/compiler/nir/nir_lower_clamp_color_outputs.c
+++ b/
src/compiler/nir/nir_lower_clamp_color_outputs.c
@@
-59,7
+59,7
@@
is_color_output(lower_state *state, nir_variable *out)
}
}
}
}
-static
void
+static
bool
lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
{
nir_variable *out = NULL;
lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
{
nir_variable *out = NULL;
@@
-79,14
+79,14
@@
lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
break;
}
}
break;
}
}
- ass
ert
(out);
+ ass
ume
(out);
break;
default:
break;
default:
- return;
+ return
false
;
}
if (out->data.mode != nir_var_shader_out)
}
if (out->data.mode != nir_var_shader_out)
- return;
+ return
false
;
if (is_color_output(state, out)) {
b->cursor = nir_before_instr(&intr->instr);
if (is_color_output(state, out)) {
b->cursor = nir_before_instr(&intr->instr);
@@
-94,38
+94,50
@@
lower_intrinsic(lower_state *state, nir_intrinsic_instr *intr)
s = nir_fsat(b, s);
nir_instr_rewrite_src(&intr->instr, &intr->src[0], nir_src_for_ssa(s));
}
s = nir_fsat(b, s);
nir_instr_rewrite_src(&intr->instr, &intr->src[0], nir_src_for_ssa(s));
}
+
+ return true;
}
static bool
lower_block(lower_state *state, nir_block *block)
{
}
static bool
lower_block(lower_state *state, nir_block *block)
{
+ bool progress = false;
+
nir_foreach_instr_safe(instr, block) {
if (instr->type == nir_instr_type_intrinsic)
nir_foreach_instr_safe(instr, block) {
if (instr->type == nir_instr_type_intrinsic)
- lower_intrinsic(state, nir_instr_as_intrinsic(instr));
+
progress |=
lower_intrinsic(state, nir_instr_as_intrinsic(instr));
}
}
- return
true
;
+ return
progress
;
}
}
-static void
+
+static bool
lower_impl(lower_state *state, nir_function_impl *impl)
{
nir_builder_init(&state->b, impl);
lower_impl(lower_state *state, nir_function_impl *impl)
{
nir_builder_init(&state->b, impl);
+ bool progress = false;
nir_foreach_block(block, impl) {
nir_foreach_block(block, impl) {
- lower_block(state, block);
+
progress |=
lower_block(state, block);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
+
+ return progress;
}
}
-void nir_lower_clamp_color_outputs(nir_shader *shader)
+bool
+nir_lower_clamp_color_outputs(nir_shader *shader)
{
{
+ bool progress = false;
lower_state state = {
.shader = shader,
};
nir_foreach_function(function, shader) {
if (function->impl)
lower_state state = {
.shader = shader,
};
nir_foreach_function(function, shader) {
if (function->impl)
- lower_impl(&state, function->impl);
+
progress |=
lower_impl(&state, function->impl);
}
}
+
+ return progress;
}
}