From d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52 Mon Sep 17 00:00:00 2001 From: marha Date: Fri, 13 May 2011 11:18:23 +0000 Subject: mesa git update 13 May 2011 --- mesalib/src/mesa/main/samplerobj.c | 2 +- mesalib/src/mesa/main/texobj.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'mesalib/src') diff --git a/mesalib/src/mesa/main/samplerobj.c b/mesalib/src/mesa/main/samplerobj.c index 229267f8c..f7774fdd7 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 f2d214f93..fdf12817c 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; -- cgit v1.2.3