r300g: fix TFP stride override.
authorDave Airlie <airlied@redhat.com>
Sun, 4 Apr 2010 10:31:42 +0000 (20:31 +1000)
committerDave Airlie <airlied@redhat.com>
Sun, 4 Apr 2010 10:31:42 +0000 (20:31 +1000)
We should use pitch for the overriden state, fixes one half of the tfp test.

Signed-off-by: Dave Airlie <airlied@redhat.com>
src/gallium/drivers/r300/r300_texture.c

index 57f2766d2e039edfe7caa460b12bac13e582b1f9..d03c28ba3506304a73cc6a96e0ea492c2bbe127f 100644 (file)
@@ -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;