From: Dave Airlie <airlied@redhat.com>
Date: Mon, 30 Nov 2015 05:51:54 +0000 (+1000)
Subject: r600/shader: allow multi-dimension arrays for tcs/tes inputs/outputs.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=92fbf856f42b22f68f62c2516e0c6453c454cf05;p=mesa.git

r600/shader: allow multi-dimension arrays for tcs/tes inputs/outputs.

This just allows multi-dim arrays to be processed.

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 ba33b4085d9..c2aaf4980b3 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -393,10 +393,16 @@ static int tgsi_is_supported(struct r600_shader_ctx *ctx)
 		   case TGSI_FILE_CONSTANT:
 			   break;
 		   case TGSI_FILE_INPUT:
-			   if (ctx->type == TGSI_PROCESSOR_GEOMETRY)
+			   if (ctx->type == TGSI_PROCESSOR_GEOMETRY ||
+			       ctx->type == TGSI_PROCESSOR_TESS_CTRL ||
+			       ctx->type == TGSI_PROCESSOR_TESS_EVAL)
+				   break;
+		   case TGSI_FILE_OUTPUT:
+			   if (ctx->type == TGSI_PROCESSOR_TESS_CTRL)
 				   break;
 		   default:
-			   R600_ERR("unsupported src %d (dimension %d)\n", j,
+			   R600_ERR("unsupported src %d (file %d, dimension %d)\n", j,
+				    i->Src[j].Register.File,
 				    i->Src[j].Register.Dimension);
 			   return -EINVAL;
 		   }
@@ -404,6 +410,8 @@ static int tgsi_is_supported(struct r600_shader_ctx *ctx)
 	}
 	for (j = 0; j < i->Instruction.NumDstRegs; j++) {
 		if (i->Dst[j].Register.Dimension) {
+			if (ctx->type == TGSI_PROCESSOR_TESS_CTRL)
+				continue;
 			R600_ERR("unsupported dst (dimension)\n");
 			return -EINVAL;
 		}