fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 11:10:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

nir/lower_atomics: fixup for new foreach_block()

Browse source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott 2016-04-08 16:01:50 -04:00 • committed by Jason Ekstrand
parent 06cf73a7ba
commit 480d78f55b
1 changed files with 11 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
src/compiler/nir/nir_lower_atomics.c
View file

@ -30,11 +30,6 @@
#include "main/config.h" #include "main/config.h"
#include <assert.h> #include <assert.h>
typedef struct {
const struct gl_shader_program *shader_program;
nir_shader *shader;
} lower_atomic_state;
/* /*
* replace atomic counter intrinsics that use a variable with intrinsics * replace atomic counter intrinsics that use a variable with intrinsics
* that directly store the buffer index and byte offset * that directly store the buffer index and byte offset
@ -42,7 +37,8 @@ typedef struct {
static void static void
lower_instr(nir_intrinsic_instr *instr, lower_instr(nir_intrinsic_instr *instr,
lower_atomic_state *state) const struct gl_shader_program *shader_program,
nir_shader *shader)
{ {
nir_intrinsic_op op; nir_intrinsic_op op;
switch (instr->intrinsic) { switch (instr->intrinsic) {
@ -72,7 +68,7 @@ lower_instr(nir_intrinsic_instr *instr,
nir_intrinsic_instr *new_instr = nir_intrinsic_instr_create(mem_ctx, op); nir_intrinsic_instr *new_instr = nir_intrinsic_instr_create(mem_ctx, op);
nir_intrinsic_set_base(new_instr, nir_intrinsic_set_base(new_instr,
state->shader_program->UniformStorage[uniform_loc].opaque[state->shader->stage].index); shader_program->UniformStorage[uniform_loc].opaque[shader->stage].index);
nir_load_const_instr *offset_const = nir_load_const_instr *offset_const =
nir_load_const_instr_create(mem_ctx, 1, 32); nir_load_const_instr_create(mem_ctx, 1, 32);
@ -137,30 +133,20 @@ lower_instr(nir_intrinsic_instr *instr,
nir_instr_remove(&instr->instr); nir_instr_remove(&instr->instr);
} }
static bool
lower_block(nir_block *block, void *state)
{
nir_foreach_instr_safe(block, instr) {
if (instr->type == nir_instr_type_intrinsic)
lower_instr(nir_instr_as_intrinsic(instr),
(lower_atomic_state *) state);
}
return true;
}
void void
nir_lower_atomics(nir_shader *shader, nir_lower_atomics(nir_shader *shader,
const struct gl_shader_program *shader_program) const struct gl_shader_program *shader_program)
{ {
lower_atomic_state state = {
.shader = shader,
.shader_program = shader_program,
};
nir_foreach_function(shader, function) { nir_foreach_function(shader, function) {
if (function->impl) { if (function->impl) {
nir_foreach_block_call(function->impl, lower_block, (void *) &state); nir_foreach_block(block, function->impl) {
nir_foreach_instr_safe(block, instr) {
if (instr->type == nir_instr_type_intrinsic)
lower_instr(nir_instr_as_intrinsic(instr),
shader_program, shader);
}
}
nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance); nir_metadata_dominance);
} }