From: Marek Olšák <maraeo@gmail.com>
Date: Sat, 13 Mar 2010 15:24:50 +0000 (+0100)
Subject: r300g: fix anisotropic filtering, fix macrotiling
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d5749fb6fc9b7bb3c8a8b1632eee6db28678b3ba;p=mesa.git

r300g: fix anisotropic filtering, fix macrotiling

Two bug fixes at the same time. :)
---

diff --git a/src/gallium/drivers/r300/r300_state.c b/src/gallium/drivers/r300/r300_state.c
index ced6c810ec5..bcd75a4225e 100644
--- a/src/gallium/drivers/r300/r300_state.c
+++ b/src/gallium/drivers/r300/r300_state.c
@@ -864,6 +864,8 @@ static void*
                                                    state->min_mip_filter,
                                                    state->max_anisotropy > 0);
 
+    sampler->filter0 |= r300_anisotropy(state->max_anisotropy);
+
     /* Unfortunately, r300-r500 don't support floating-point mipmap lods. */
     /* We must pass these to the merge function to clamp them properly. */
     sampler->min_lod = MAX2((unsigned)state->min_lod, 0);
@@ -873,8 +875,6 @@ static void*
 
     sampler->filter1 |= lod_bias << R300_LOD_BIAS_SHIFT;
 
-    sampler->filter1 |= r300_anisotropy(state->max_anisotropy);
-
     util_pack_color(state->border_color, PIPE_FORMAT_B8G8R8A8_UNORM, &uc);
     sampler->border_color = uc.ui;