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

nir/lower_samplers: Clean up function arguments

Browse Source 
This little refactor makes us stop passing stage around and puts the
builder as the first parameter to some functions.

Acked-by: Rob Clark <robdclark@gmail.com>
Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Acked-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
This commit is contained in:
Jason Ekstrand
2018-03-15 09:32:24 -07:00
parent a6ebbbc594
commit 36efae1d66
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/compiler/glsl/gl_nir_lower_samplers.c
View File

@@ -86,8 +86,8 @@ calc_sampler_offsets(nir_deref *tail, nir_tex_instr *instr,
} }
static bool static bool
lower_sampler(nir_tex_instr *instr, const struct gl_shader_program *shader_program, lower_sampler(nir_builder *b, nir_tex_instr *instr,
gl_shader_stage stage, nir_builder *b) const struct gl_shader_program *shader_program)
{ {
if (instr->texture == NULL) if (instr->texture == NULL)
return false; return false;
@@ -116,6 +116,7 @@ lower_sampler(nir_tex_instr *instr, const struct gl_shader_program *shader_progr
instr->texture_array_size = array_elements; instr->texture_array_size = array_elements;
} }
gl_shader_stage stage = b->shader->info.stage;
assert(location < shader_program->data->NumUniformStorage && assert(location < shader_program->data->NumUniformStorage &&
shader_program->data->UniformStorage[location].opaque[stage].active); shader_program->data->UniformStorage[location].opaque[stage].active);
@@ -131,8 +132,8 @@ lower_sampler(nir_tex_instr *instr, const struct gl_shader_program *shader_progr
} }
static bool static bool
lower_impl(nir_function_impl *impl, const struct gl_shader_program *shader_program, lower_impl(nir_function_impl *impl,
gl_shader_stage stage) const struct gl_shader_program *shader_program)
{ {
nir_builder b; nir_builder b;
nir_builder_init(&b, impl); nir_builder_init(&b, impl);
@@ -141,8 +142,8 @@ lower_impl(nir_function_impl *impl, const struct gl_shader_program *shader_progr
nir_foreach_block(block, impl) { nir_foreach_block(block, impl) {
nir_foreach_instr(instr, block) { nir_foreach_instr(instr, block) {
if (instr->type == nir_instr_type_tex) if (instr->type == nir_instr_type_tex)
progress |= lower_sampler(nir_instr_as_tex(instr), progress |= lower_sampler(&b, nir_instr_as_tex(instr),
shader_program, stage, &b); shader_program);
} }
} }
@@ -159,8 +160,7 @@ gl_nir_lower_samplers(nir_shader *shader,
nir_foreach_function(function, shader) { nir_foreach_function(function, shader) {
if (function->impl) if (function->impl)
progress |= lower_impl(function->impl, shader_program, progress |= lower_impl(function->impl, shader_program);
shader->info.stage);
} }
return progress; return progress;