From: Marek Olšák <marek.olsak@amd.com>
Date: Sat, 15 Oct 2016 12:25:40 +0000 (+0200)
Subject: radeonsi/gfx9: Gather4 no longer needs the workaround
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=de7967a27a0830c6c9537e138d02a2224e426909;p=mesa.git

radeonsi/gfx9: Gather4 no longer needs the workaround

Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
---

diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c
index 46c7d411704..5ecbac8b276 100644
--- a/src/gallium/drivers/radeonsi/si_shader.c
+++ b/src/gallium/drivers/radeonsi/si_shader.c
@@ -4802,7 +4802,8 @@ static void build_tex_intrinsic(const struct lp_build_tgsi_action *action,
 	}
 
 	/* The hardware needs special lowering for Gather4 with integer formats. */
-	if (opcode == TGSI_OPCODE_TG4) {
+	if (ctx->screen->b.chip_class <= VI &&
+	    opcode == TGSI_OPCODE_TG4) {
 		struct tgsi_shader_info *info = &ctx->shader->selector->info;
 		/* This will also work with non-constant indexing because of how
 		 * glsl_to_tgsi works and we intent to preserve that behavior.