From: Kenneth Graunke <kenneth@whitecape.org>
Date: Tue, 29 Mar 2016 22:35:07 +0000 (-0700)
Subject: Revert "i965: Set address rounding bits for GL_NEAREST filtering as well."
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=f8c69fbb5491c8790dd3bcf991f06151d15d92b9;p=mesa.git

Revert "i965: Set address rounding bits for GL_NEAREST filtering as well."

This reverts commit 60d6a8989ab44cf47accee6bc692ba6fb98f6a9f.

It's pretty sketchy, and apparently regressed a bunch of dEQP tests
on Sandybridge.
---

diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c
index 7bd21f7aaf0..3bd22c7559f 100644
--- a/src/mesa/drivers/dri/i965/brw_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c
@@ -436,17 +436,14 @@ brw_update_sampler_state(struct brw_context *brw,
       }
    }
 
-   /* Set address rounding bits.  The conditions are empirically
-    * derived in order to pass test cases.
-    */
-   bool round_nearest = brw->gen >= 6 && target != GL_TEXTURE_3D;
+   /* Set address rounding bits if not using nearest filtering. */
    unsigned address_rounding = 0;
-   if (min_filter != BRW_MAPFILTER_NEAREST || round_nearest) {
+   if (min_filter != BRW_MAPFILTER_NEAREST) {
       address_rounding |= BRW_ADDRESS_ROUNDING_ENABLE_U_MIN |
                           BRW_ADDRESS_ROUNDING_ENABLE_V_MIN |
                           BRW_ADDRESS_ROUNDING_ENABLE_R_MIN;
    }
-   if (mag_filter != BRW_MAPFILTER_NEAREST || round_nearest) {
+   if (mag_filter != BRW_MAPFILTER_NEAREST) {
       address_rounding |= BRW_ADDRESS_ROUNDING_ENABLE_U_MAG |
                           BRW_ADDRESS_ROUNDING_ENABLE_V_MAG |
                           BRW_ADDRESS_ROUNDING_ENABLE_R_MAG;