Mesa (master): mesa: EXT_texture_sRGB_decode little fixup

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Fri May 13 01:15:53 2011 +0200

mesa: EXT_texture_sRGB_decode little fixup

It doesn't fix bug 37150 though.

---

 src/mesa/main/samplerobj.c |    2 +-
 src/mesa/main/texobj.c     |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 229267f..f7774fd 100644
--- a/src/mesa/main/samplerobj.c
+++ b/src/mesa/main/samplerobj.c
@@ -132,7 +132,7 @@ _mesa_init_sampler_object(struct gl_sampler_object *sampObj, GLuint name)
    sampObj->CompareMode = GL_NONE;
    sampObj->CompareFunc = GL_LEQUAL;
    sampObj->CompareFailValue = 0.0;
-   sampObj->sRGBDecode = GL_FALSE;
+   sampObj->sRGBDecode = GL_DECODE_EXT;
    sampObj->CubeMapSeamless = GL_FALSE;
    sampObj->DepthMode = 0;
 }
diff --git a/src/mesa/main/texobj.c b/src/mesa/main/texobj.c
index f2d214f..fdf1281 100644
--- a/src/mesa/main/texobj.c
+++ b/src/mesa/main/texobj.c
@@ -254,6 +254,7 @@ _mesa_copy_texture_object( struct gl_texture_object *dest,
    dest->Sampler.CompareFailValue = src->Sampler.CompareFailValue;
    dest->Sampler.CubeMapSeamless = src->Sampler.CubeMapSeamless;
    dest->Sampler.DepthMode = src->Sampler.DepthMode;
+   dest->Sampler.sRGBDecode = src->Sampler.sRGBDecode;
    dest->_MaxLevel = src->_MaxLevel;
    dest->_MaxLambda = src->_MaxLambda;
    dest->GenerateMipmap = src->GenerateMipmap;