summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-05-13 01:15:53 +0200
committerMarek Olšák <maraeo@gmail.com>2011-05-13 01:43:28 +0200
commit8a506374536497495bac27db6cd15ffd06bb01a2 (patch)
tree936b0a56108ad01b6de94622e274d7c701b05bef /src/mesa/main
parent1ca3efe5485a5e3800c4bc637a65a733257fb89e (diff)
mesa: EXT_texture_sRGB_decode little fixup
It doesn't fix bug 37150 though.
Diffstat (limited to 'src/mesa/main')
-rw-r--r--src/mesa/main/samplerobj.c2
-rw-r--r--src/mesa/main/texobj.c1
2 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/samplerobj.c b/src/mesa/main/samplerobj.c
index 229267f8c94..f7774fdd7cb 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 f2d214f931b..fdf12817c9a 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;