From: Dave Airlie <airlied@redhat.com>
Date: Sun, 4 Apr 2010 10:31:42 +0000 (+1000)
Subject: r300g: fix TFP stride override.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d605b0db4d4318d2616fffc158e57732c416c5c3;p=mesa.git

r300g: fix TFP stride override.

We should use pitch for the overriden state, fixes one half of the tfp test.

Signed-off-by: Dave Airlie <airlied@redhat.com>
---

diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 57f2766d2e0..d03c28ba350 100644
--- a/src/gallium/drivers/r300/r300_texture.c
+++ b/src/gallium/drivers/r300/r300_texture.c
@@ -521,7 +521,7 @@ static void r300_setup_texture_state(struct r300_screen* screen, struct r300_tex
     state->format0 = R300_TX_WIDTH((pt->width0 - 1) & 0x7ff) |
                      R300_TX_HEIGHT((pt->height0 - 1) & 0x7ff);
 
-    if (tex->is_npot) {
+    if (tex->is_npot || tex->stride_override) {
         /* rectangles love this */
         state->format0 |= R300_TX_PITCH_EN;
         state->format2 = (tex->pitch[0] - 1) & 0x1fff;