From de7967a27a0830c6c9537e138d02a2224e426909 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 15 Oct 2016 14:25:40 +0200 Subject: [PATCH] radeonsi/gfx9: Gather4 no longer needs the workaround MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/radeonsi/si_shader.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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. -- 2.30.2