From: Patrice Mandin <patmandin@gmail.com>
Date: Sat, 12 Dec 2009 22:15:08 +0000 (+0100)
Subject: Revert "nouveau: nv30: Disable swizzled surface usage if any dimension is 1 (Warsow... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b91503f45740e6e2a5db92609aed887b6c7bd460;p=mesa.git

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

This reverts commit ec7844537ecdb0b598447e37bf0b7120acd029f3.
---

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index fd7c65f6b37..920fe64c32f 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;