diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-09 10:10:32 +0000 |
| commit | 5bb5135182a1a50b1b6659d8aa5168ebfbe71979 (patch) | |
| tree | 7c8f16bf0832a90195bdbc4e8a9477158e0acf9b /mesalib/src/mesa/main/texobj.c | |
| parent | c721bc9b176ec37d8b80a92c89840658f8f6c458 (diff) | |
| parent | 43b2398ee28e9144fd51eb9994d67c4c9a198c9c (diff) | |
| download | vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.gz vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.tar.bz2 vcxsrv-5bb5135182a1a50b1b6659d8aa5168ebfbe71979.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/main/texobj.c')
| -rw-r--r-- | mesalib/src/mesa/main/texobj.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/texobj.c b/mesalib/src/mesa/main/texobj.c index 426347e1b..9dc065a5d 100644 --- a/mesalib/src/mesa/main/texobj.c +++ b/mesalib/src/mesa/main/texobj.c @@ -141,6 +141,7 @@ _mesa_initialize_texture_object( struct gl_texture_object *obj, obj->Sampler.CompareFunc = GL_LEQUAL; /* ARB_shadow */
obj->Sampler.CompareFailValue = 0.0F; /* ARB_shadow_ambient */
obj->Sampler.DepthMode = GL_LUMINANCE; /* ARB_depth_texture */
+ obj->Sampler.CubeMapSeamless = GL_FALSE;
obj->Swizzle[0] = GL_RED;
obj->Swizzle[1] = GL_GREEN;
obj->Swizzle[2] = GL_BLUE;
@@ -251,6 +252,7 @@ _mesa_copy_texture_object( struct gl_texture_object *dest, dest->Sampler.CompareMode = src->Sampler.CompareMode;
dest->Sampler.CompareFunc = src->Sampler.CompareFunc;
dest->Sampler.CompareFailValue = src->Sampler.CompareFailValue;
+ dest->Sampler.CubeMapSeamless = src->Sampler.CubeMapSeamless;
dest->Sampler.DepthMode = src->Sampler.DepthMode;
dest->_MaxLevel = src->_MaxLevel;
dest->_MaxLambda = src->_MaxLambda;
|