From: Chris Forbes <chrisf@ijw.co.nz>
Date: Fri, 29 Nov 2013 09:04:58 +0000 (+1300)
Subject: i965: Don't flag gather quirks for Gen8+
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1ca5802401c384c1eadbf72cf910c65e377600c;p=mesa.git

i965: Don't flag gather quirks for Gen8+

My understanding is that Broadwell retains the same SCS mechanism
that Haswell has, so even if the underlying issue with this format
is not fixed, the w/a will be applied in SCS rather than needing
shader code.

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>
Cc: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
---

diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index a2ae73f1e14..6739a9132da 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -353,7 +353,7 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
 
          /* gather4's channel select for green from RG32F is broken;
           * requires a shader w/a on IVB; fixable with just SCS on HSW. */
-         if (brw->gen >= 7 && !brw->is_haswell && prog->UsesGather) {
+         if (brw->gen == 7 && !brw->is_haswell && prog->UsesGather) {
             if (img->InternalFormat == GL_RG32F)
                key->gather_channel_quirk_mask |= 1 << s;
          }