projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
nir/lower_io: fixup for new foreach_block()
[mesa.git]
/
src
/
compiler
/
nir
/
nir_lower_io.c
diff --git
a/src/compiler/nir/nir_lower_io.c
b/src/compiler/nir/nir_lower_io.c
index 369a8ee537ed7d6a24ec16eb168ea5aeaca94840..e0ba9347bfe3b6abed4a06896cf5638b92fc257f 100644
(file)
--- a/
src/compiler/nir/nir_lower_io.c
+++ b/
src/compiler/nir/nir_lower_io.c
@@
-211,10
+211,9
@@
atomic_op(nir_intrinsic_op opcode)
}
static bool
}
static bool
-nir_lower_io_block(nir_block *block, void *void_state)
+nir_lower_io_block(nir_block *block,
+ struct lower_io_state *state)
{
{
- struct lower_io_state *state = void_state;
-
nir_builder *b = &state->builder;
nir_foreach_instr_safe(block, instr) {
nir_builder *b = &state->builder;
nir_foreach_instr_safe(block, instr) {
@@
-278,8
+277,8
@@
nir_lower_io_block(nir_block *block, void *void_state)
intrin->variables[0]->var->data.driver_location);
if (load->intrinsic == nir_intrinsic_load_uniform) {
intrin->variables[0]->var->data.driver_location);
if (load->intrinsic == nir_intrinsic_load_uniform) {
- load->const_index[1] =
- state->type_size(intrin->variables[0]->var->type);
+ nir_intrinsic_set_range(load,
+ state->type_size(intrin->variables[0]->var->type)
)
;
}
if (per_vertex)
}
if (per_vertex)
@@
-403,7
+402,9
@@
nir_lower_io_impl(nir_function_impl *impl,
state.modes = modes;
state.type_size = type_size;
state.modes = modes;
state.type_size = type_size;
- nir_foreach_block(impl, nir_lower_io_block, &state);
+ nir_foreach_block(block, impl) {
+ nir_lower_io_block(block, &state);
+ }
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);