Mesa (master): r300g: re-enable SRGB formats

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Feb 20 18:52:20 2010 +0100

r300g: re-enable SRGB formats

Ouch.

---

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

diff --git a/src/gallium/drivers/r300/r300_texture.h b/src/gallium/drivers/r300/r300_texture.h
index 153f4ee..e2c1032 100644
--- a/src/gallium/drivers/r300/r300_texture.h
+++ b/src/gallium/drivers/r300/r300_texture.h
@@ -208,7 +208,8 @@ static INLINE uint32_t r300_translate_texformat(enum pipe_format format)
     switch (desc->channel[0].type) {
         case UTIL_FORMAT_TYPE_UNSIGNED:
         case UTIL_FORMAT_TYPE_SIGNED:
-            if (!desc->channel[0].normalized) {
+            if (!desc->channel[0].normalized &&
+                desc->colorspace != UTIL_FORMAT_COLORSPACE_SRGB) {
                 return ~0;
             }