Mesa (master): radv: fix btoi for R32G32B32 when the dest offset is not 0

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 69c44de7987e27744c07f9b577664875f7a278d1
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=69c44de7987e27744c07f9b577664875f7a278d1

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Mon Oct 22 15:42:31 2018 +0200

radv: fix btoi for R32G32B32 when the dest offset is not 0

Fixes: 593996bc02 ("radv: implement buffer to image operations for R32G32B32")
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Bas Nieuwenhuizen <bas at basnieuwenhuizen.nl>

---

 src/amd/vulkan/radv_meta_bufimage.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/amd/vulkan/radv_meta_bufimage.c b/src/amd/vulkan/radv_meta_bufimage.c
index 73a5034222..ec449c5bca 100644
--- a/src/amd/vulkan/radv_meta_bufimage.c
+++ b/src/amd/vulkan/radv_meta_bufimage.c
@@ -556,8 +556,8 @@ build_nir_btoi_r32g32b32_compute_shader(struct radv_device *dev)
 
 	nir_ssa_def *global_pos =
 		nir_iadd(&b,
-			 nir_imul(&b, pos_y, &pitch->dest.ssa),
-			 nir_imul(&b, pos_x, nir_imm_int(&b, 3)));
+			 nir_imul(&b, nir_channel(&b, img_coord, 1), &pitch->dest.ssa),
+			 nir_imul(&b, nir_channel(&b, img_coord, 0), nir_imm_int(&b, 3)));
 
 	nir_ssa_def *input_img_deref = &nir_build_deref_var(&b, input_img)->dest.ssa;