Mesa (master): r300g: fix TFP stride override.

[Dave Airlie]

Module: Mesa
Branch: master
Commit: d605b0db4d4318d2616fffc158e57732c416c5c3
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=d605b0db4d4318d2616fffc158e57732c416c5c3

Author: Dave Airlie <airlied at redhat.com>
Date:   Sun Apr  4 20:31:42 2010 +1000

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 at redhat.com>

---

 src/gallium/drivers/r300/r300_texture.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r300/r300_texture.c b/src/gallium/drivers/r300/r300_texture.c
index 57f2766..d03c28b 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;