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

intel/compiler: Lower cube image sizes using nir_lower_image() 

Reworks:
 * Re-merge early/late passes using Jason's nir image deref patches
 * Create and use a common nir_lower_image() pass. (s-b Jason)
 * Remove cube array size handling in image load/store lowering

Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9466>
This commit is contained in:
Jordan Justen 2021-02-03 10:52:04 -08:00
parent b5514a2236
commit e2a30ebf44
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/intel/compiler/brw_nir_lower_storage_image.c
View File

@ -655,15 +655,10 @@ lower_image_size_instr(nir_builder *b,
nir_ssa_def *comps[4] = { NULL, NULL, NULL, NULL };
enum glsl_sampler_dim dim = glsl_get_sampler_dim(deref->type);
assert(nir_intrinsic_image_dim(intrin) != GLSL_SAMPLER_DIM_CUBE);
unsigned coord_comps = glsl_get_sampler_coordinate_components(deref->type);
for (unsigned c = 0; c < coord_comps; c++) {
if (c == 2 && dim == GLSL_SAMPLER_DIM_CUBE) {
comps[2] = nir_idiv(b, nir_channel(b, size, 2), nir_imm_int(b, 6));
} else {
comps[c] = nir_channel(b, size, c);
}
}
for (unsigned c = 0; c < coord_comps; c++)
comps[c] = nir_channel(b, size, c);
for (unsigned c = coord_comps; c < intrin->dest.ssa.num_components; ++c)
comps[c] = nir_imm_int(b, 1);
@ -681,6 +676,11 @@ brw_nir_lower_storage_image(nir_shader *shader,
{
bool progress = false;
const nir_lower_image_options image_options = {
.lower_cube_size = true,
};
progress |= nir_lower_image(shader, &image_options);
nir_foreach_function(function, shader) {
if (function->impl == NULL)
continue;