From: Christian König <deathsimple@vodafone.de>
Date: Sun, 12 Dec 2010 14:37:54 +0000 (+0100)
Subject: r600g: texture instructions also work fine with TGSI_FILE_INPUT
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=7bc9ab1181ff3dd8db67f6b020857820c49e0cbb;p=mesa.git

r600g: texture instructions also work fine with TGSI_FILE_INPUT
---

diff --git a/src/gallium/drivers/r600/r600_shader.c b/src/gallium/drivers/r600/r600_shader.c
index 64c8b82c112..6cf23535515 100644
--- a/src/gallium/drivers/r600/r600_shader.c
+++ b/src/gallium/drivers/r600/r600_shader.c
@@ -1700,7 +1700,9 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 	unsigned src_gpr;
 	int r, i;
 	int opcode;
-	boolean src_not_temp = inst->Src[0].Register.File != TGSI_FILE_TEMPORARY;
+	boolean src_not_temp =
+		inst->Src[0].Register.File != TGSI_FILE_TEMPORARY &&
+		inst->Src[0].Register.File != TGSI_FILE_INPUT;
 	uint32_t lit_vals[4];
 
 	src_gpr = ctx->file_offset[inst->Src[0].Register.File] + inst->Src[0].Register.Index;
@@ -1870,7 +1872,6 @@ static int tgsi_tex(struct r600_shader_ctx *ctx)
 	}
 
 	if (src_not_temp) {
-                assert(0);
 		for (i = 0; i < 4; i++) {
 			memset(&alu, 0, sizeof(struct r600_bc_alu));
 			alu.inst = CTX_INST(V_SQ_ALU_WORD1_OP2_SQ_OP2_INST_MOV);