From: Christian König <deathsimple@vodafone.de>
Date: Mon, 11 Jul 2011 09:39:11 +0000 (+0200)
Subject: r600g: revert "support textures with scaled number formats"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=358795bc0bacdba9a36bb010ef18ee1b2d086f2d;p=mesa.git

r600g: revert "support textures with scaled number formats"

We should add those probably when merged to master.
---

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 63cacbbd50c..a6161e5f281 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -1018,7 +1018,7 @@ uint32_t r600_translate_texformat(struct pipe_screen *screen,
 	case UTIL_FORMAT_TYPE_SIGNED:
 		if (!desc->channel[i].normalized &&
 		    desc->colorspace != UTIL_FORMAT_COLORSPACE_SRGB) {
-			word4 |= S_038010_NUM_FORMAT_ALL(V_038010_SQ_NUM_FORMAT_SCALED);
+			goto out_unknown;
 		}
 
 		switch (desc->channel[i].size) {