From: Dave Airlie <airlied@redhat.com>
Date: Fri, 2 Feb 2018 07:28:15 +0000 (+1000)
Subject: r600: fix resq for buffer images.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7801425028a3261ba091603763b515959e73815f;p=mesa.git

r600: fix resq for buffer images.

If this is an image buffer, we need to calculate the correct resource
id.

Fixes:
KHR-GL45.shader_image_size.*

Reviewed-by: Roland Scheidegger <sroland@vmware.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 13aa681049c..b0931a3a851 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -8759,7 +8759,10 @@ static int tgsi_resq(struct r600_shader_ctx *ctx)
 	    (inst->Src[0].Register.File == TGSI_FILE_IMAGE && inst->Memory.Texture == TGSI_TEXTURE_BUFFER)) {
 		if (ctx->bc->chip_class < EVERGREEN)
 			ctx->shader->uses_tex_buffers = true;
-		return r600_do_buffer_txq(ctx, 0, ctx->shader->image_size_const_offset);
+		unsigned offset = 0;
+		if (inst->Src[0].Register.File == TGSI_FILE_IMAGE)
+			offset += R600_IMAGE_REAL_RESOURCE_OFFSET - R600_MAX_CONST_BUFFERS + ctx->shader->image_size_const_offset;
+		return r600_do_buffer_txq(ctx, 0, offset);
 	}
 
 	if (inst->Memory.Texture == TGSI_TEXTURE_CUBE_ARRAY &&