r600: fix textureSize queries with tbos

piglit doesn't care, but I'm quite confident that the size actually bound
as range should be reported and not the base size of the resource (and
some quick piglit test hacking confirms this).
Also, the array in the constant buffer looks overallocated by a factor of 4.
For eg, also decrease the size by another factor of 2 by using the same
constant slot for both buffer size (required for txq for TBOs) and the number
of layers for cube arrays, as these are mutually exclusive. Could of course use
some more logic and only actually do this for the samplers/images/buffers where
it's required rather than for all, but ah well...

Reviewed-by: Dave Airlie <[email protected]>

1 files changed, 9 insertions, 9 deletions

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index c9247e1c286..e28882b2e5d 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -6955,9 +6955,9 @@ static int r600_do_buffer_txq(struct r600_shader_ctx *ctx, int reg_idx, int offs
 	alu.op = ALU_OP1_MOV;
 	alu.src[0].sel = R600_SHADER_BUFFER_INFO_SEL;
 	if (ctx->bc->chip_class >= EVERGREEN) {
-		/* channel 0 or 2 of each word */
-		alu.src[0].sel += (id / 2);
-		alu.src[0].chan = (id % 2) * 2;
+		/* with eg each dword is either buf size or number of cubes */
+		alu.src[0].sel += id / 4;
+		alu.src[0].chan = id % 4;
 	} else {
 		/* r600 we have them at channel 2 of the second dword */
 		alu.src[0].sel += (id * 2) + 1;
@@ -7615,9 +7615,9 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 
 		alu.src[0].sel = R600_SHADER_BUFFER_INFO_SEL;
 		if (ctx->bc->chip_class >= EVERGREEN) {
-			/* channel 1 or 3 of each word */
-			alu.src[0].sel += (id / 2);
-			alu.src[0].chan = ((id % 2) * 2) + 1;
+			/* with eg each dword is either buf size or number of cubes */
+			alu.src[0].sel += id / 4;
+			alu.src[0].chan = id % 4;
 		} else {
 			/* r600 we have them at channel 2 of the second dword */
 			alu.src[0].sel += (id * 2) + 1;
@@ -8782,9 +8782,9 @@ static int tgsi_resq(struct r600_shader_ctx *ctx)
 		alu.op = ALU_OP1_MOV;
 
 		alu.src[0].sel = R600_SHADER_BUFFER_INFO_SEL;
-		/* channel 1 or 3 of each word */
-		alu.src[0].sel += (id / 2);
-		alu.src[0].chan = ((id % 2) * 2) + 1;
+		/* with eg each dword is either buf size or number of cubes */
+		alu.src[0].sel += id / 4;
+		alu.src[0].chan = id % 4;
 		alu.src[0].kc_bank = R600_BUFFER_INFO_CONST_BUFFER;
 		tgsi_dst(ctx, &inst->Dst[0], 2, &alu.dst);
 		alu.last = 1;