mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 12:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

nir/lower_cl_images: lower scalar image_loads to vec4

Browse Source 
This will be required for supporting depth images as the rest of mesa assumes those
to always return vec4.

Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30831>
This commit is contained in:
Karol Herbst 2024-09-20 16:34:52 +02:00 committed by Marge Bot
parent b805e23f40
commit fa379a9495
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/compiler/nir/nir_lower_cl_images.c
View File

@ -172,12 +172,6 @@ nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_samp
nir_builder b = nir_builder_create(impl);
/* don't need any lowering if we can keep the derefs */
if (!lower_image_derefs && !lower_sampler_derefs) {
nir_metadata_preserve(impl, nir_metadata_all);
return false;
}
bool progress = false;
nir_foreach_block_reverse(block, impl) {
nir_foreach_instr_reverse_safe(instr, block) {
@ -262,6 +256,18 @@ nir_lower_cl_images(nir_shader *shader, bool lower_image_derefs, bool lower_samp
case nir_intrinsic_image_deref_atomic_swap:
case nir_intrinsic_image_deref_size:
case nir_intrinsic_image_deref_samples: {
/* CL_DEPTH image loads return a scalar value */
if (intrin->intrinsic == nir_intrinsic_image_deref_load &&
intrin->def.num_components == 1) {
b.cursor = nir_after_instr(&intrin->instr);
intrin->num_components = 4;
intrin->def.num_components = 4;
nir_def *scalar = nir_channel(&b, &intrin->def, 0);
nir_def_rewrite_uses_after(&intrin->def, scalar, scalar->parent_instr);
progress = true;
}
if (!lower_image_derefs)
break;