fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

spirv: Don't add 0.5 to array indicies for OpImageSampleExplicitLod

Browse source 
This fixes CLs 1.2 1Darray and 2Darray images.

Fixes: 589d918a4f
       ("spirv: Add 0.5 to integer coordinates for OpImageSampleExplicitLod")

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13401>
This commit is contained in:
Karol Herbst 2020-11-03 17:41:53 +01:00 • committed by Dave Airlie
parent ab2cfeba48
commit f6ecd284e5
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/compiler/spirv/spirv_to_nir.c
View file

@ -2832,9 +2832,16 @@ vtn_handle_texture(struct vtn_builder *b, SpvOp opcode,
"Unless the Kernel capability is being used, the coordinate parameter "
"OpImageSampleExplicitLod must be floating point.");
p->src = nir_src_for_ssa(
nir_fadd(&b->nb, nir_i2f32(&b->nb, p->src.ssa),
nir_imm_float(&b->nb, 0.5)));
nir_ssa_def *coords[4];
nir_ssa_def *f0_5 = nir_imm_float(&b->nb, 0.5);
for (unsigned i = 0; i < coord_components; i++) {
coords[i] = nir_i2f32(&b->nb, nir_channel(&b->nb, p->src.ssa, i));
if (!is_array || i != coord_components - 1)
coords[i] = nir_fadd(&b->nb, coords[i], f0_5);
}
p->src = nir_src_for_ssa(nir_vec(&b->nb, coords, coord_components));
}
p->src_type = nir_tex_src_coord;