diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-13 11:18:23 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-13 11:18:23 +0000 |
| commit | d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52 (patch) | |
| tree | 962eacfe215c51eed9d74d53ac056d5dc0ee128d | |
| parent | 6355693a021ce9473196b685cc9f8c2cbb0899a8 (diff) | |
| download | vcxsrv-d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52.tar.gz vcxsrv-d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52.tar.bz2 vcxsrv-d8c3e3d2ba88d6b87a718aef7f4fb4627113eb52.zip | |
mesa git update 13 May 2011
| -rw-r--r-- | mesalib/include/GL/glu.h | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/samplerobj.c | 2 | ||||
| -rw-r--r-- | mesalib/src/mesa/main/texobj.c | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/mesalib/include/GL/glu.h b/mesalib/include/GL/glu.h index cd967ac5e..ba2228d8d 100644 --- a/mesalib/include/GL/glu.h +++ b/mesalib/include/GL/glu.h @@ -284,7 +284,7 @@ typedef GLUtesselator GLUtriangulatorObj; #define GLU_TESS_MAX_COORD 1.0e150 /* Internal convenience typedefs */ -typedef void (GLAPIENTRYP _GLUfuncptr)(); +typedef void (GLAPIENTRYP _GLUfuncptr)(void); GLAPI void GLAPIENTRY gluBeginCurve (GLUnurbs* nurb); GLAPI void GLAPIENTRY gluBeginPolygon (GLUtesselator* tess); 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; |