KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965/uniforms: Handle images as a separate pass 

Instead of walking all uniforms and handling images as a special case,
walk "normal" uniforms first and images as a second pass.  This lets us
use nir_foreach_image_variable which will survive the upcoming refactor.
While we're at it, use nir_foreach_image_variable in
brw_nir_lower_gl_images too.

Reviewed-by: Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4743>
This commit is contained in:
Jason Ekstrand 2021-09-15 11:34:06 -05:00 committed by Marge Bot
parent 2d7065ef04
commit ff39916ce7
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/drivers/dri/i965/brw_nir_uniforms.cpp
View File

@ -150,14 +150,10 @@ brw_nir_setup_glsl_uniform(gl_shader_stage stage, nir_variable *var,
struct brw_stage_prog_data *stage_prog_data,
bool is_scalar)
{
if (var->type->without_array()->is_sampler())
if (var->type->without_array()->is_sampler() ||
var->type->without_array()->is_image())
return;
if (var->type->without_array()->is_image()) {
brw_setup_image_uniform_values(var, stage_prog_data);
return;
}
/* The data for our (non-builtin) uniforms is stored in a series of
* gl_uniform_storage structs for each subcomponent that
* glGetUniformLocation() could name. We know it's been set up in the same
@ -236,6 +232,9 @@ brw_nir_setup_glsl_uniforms(void *mem_ctx, nir_shader *shader,
stage_prog_data, is_scalar);
}
}
nir_foreach_image_variable(var, shader)
brw_setup_image_uniform_values(var, stage_prog_data);
}
void
@ -306,12 +305,7 @@ brw_nir_lower_gl_images(nir_shader *shader,
const struct gl_program *prog)
{
/* We put image uniforms at the end */
nir_foreach_uniform_variable(var, shader) {
if (!var->type->contains_image())
continue;
/* GL Only allows arrays of arrays of images */
assert(var->type->without_array()->is_image());
nir_foreach_image_variable(var, shader) {
const unsigned num_images = MAX2(1, var->type->arrays_of_arrays_size());
var->data.driver_location = shader->num_uniforms;