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

nir/normalize_cubemap_coords: fixup for new foreach_block()

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott
2016-04-08 17:29:45 -04:00
committed by Jason Ekstrand
parent 492b3554a7
commit f4ebff89e4
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/compiler/nir/nir_normalize_cubemap_coords.c
View File

@@ -33,16 +33,10 @@
* or 1.0. This is based on the old GLSL IR based pass by Eric.
*/
struct normalize_cubemap_state {
nir_builder b;
bool progress;
};
static bool
normalize_cubemap_coords_block(nir_block *block, void *void_state)
normalize_cubemap_coords_block(nir_block *block, nir_builder *b)
{
struct normalize_cubemap_state *state = void_state;
nir_builder *b = &state->b;
bool progress = false;
nir_foreach_instr(block, instr) {
if (instr->type != nir_instr_type_tex)
@@ -84,26 +78,28 @@ normalize_cubemap_coords_block(nir_block *block, void *void_state)
&tex->src[i].src,
nir_src_for_ssa(normalized));
state->progress = true;
progress = true;
}
}
return true;
return progress;
}
static bool
normalize_cubemap_coords_impl(nir_function_impl *impl)
{
struct normalize_cubemap_state state;
nir_builder_init(&state.b, impl);
state.progress = false;
nir_builder b;
nir_builder_init(&b, impl);
bool progress = false;
nir_foreach_block_call(impl, normalize_cubemap_coords_block, &state);
nir_foreach_block(block, impl) {
progress |= normalize_cubemap_coords_block(block, &b);
}
nir_metadata_preserve(impl, nir_metadata_block_index |
nir_metadata_dominance);
return state.progress;
return progress;
}
bool