Mesa (master): Revert "nouveau: nv30: Disable swizzled surface usage if any dimension is 1 ( Warsow creates a 1x1 front buffer)"

Patrice Mandin pmandin at kemper.freedesktop.org
Sat Dec 12 14:16:45 PST 2009


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

Author: Patrice Mandin <patmandin at gmail.com>
Date:   Sat Dec 12 23:15:08 2009 +0100

Revert "nouveau: nv30: Disable swizzled surface usage if any dimension is 1 (Warsow creates a 1x1 front buffer)"

This reverts commit ec7844537ecdb0b598447e37bf0b7120acd029f3.

---

 src/gallium/drivers/nv30/nv30_miptree.c |    3 ---
 1 files changed, 0 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index fd7c65f..920fe64 100644
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -72,9 +72,6 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
 	mt->base.screen = pscreen;
 
 	/* Swizzled textures must be POT */
-	if ((pt->width0 == 1) || (pt->height0 == 1)) {
-		mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
-	} else
 	if (pt->width0 & (pt->width0 - 1) ||
 	    pt->height0 & (pt->height0 - 1))
 		mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;



More information about the mesa-commit mailing list