diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-13 11:23:57 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-13 11:23:57 +0000 |
| commit | 421ecdd3ee6f691c63c4568944423d986f9f69db (patch) | |
| tree | 55cec7ded9c9e4cf15fd6f38f7b5d425725c86e3 /mesalib/src | |
| parent | 3e9b8f0b0c2c4a0fdde2013a5445ebce9c344dd4 (diff) | |
| parent | d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52 (diff) | |
| download | vcxsrv-421ecdd3ee6f691c63c4568944423d986f9f69db.tar.gz vcxsrv-421ecdd3ee6f691c63c4568944423d986f9f69db.tar.bz2 vcxsrv-421ecdd3ee6f691c63c4568944423d986f9f69db.zip | |
merge ^/branches/released .
Diffstat (limited to 'mesalib/src')
| -rw-r--r-- | mesalib/src/mesa/main/samplerobj.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texobj.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c index 473190638..9a5ba2955 100644 --- a/mesalib/src/mesa/main/samplerobj.c +++ b/mesalib/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/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index 9dc065a5d..ffce68a0e 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/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;
|