diff options
| author | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-08-03 09:39:10 +0200 |
| commit | e158f8fc4a9cf2f884d156ff2dfc0870facfbcba (patch) | |
| tree | 9642a988d6674f27d6971ec2be7e2cdacc784862 /mesalib/src/mesa/main/texstate.c | |
| parent | ebfd1ae8f80dd16f99f9ef89c28a06f809d07f8d (diff) | |
| parent | 18e75aa6ae27a6e44d93babd96afbbe0cd6077c8 (diff) | |
| download | vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.gz vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.tar.bz2 vcxsrv-e158f8fc4a9cf2f884d156ff2dfc0870facfbcba.zip | |
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/texstate.c')
| -rw-r--r-- | mesalib/src/mesa/main/texstate.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/texstate.c b/mesalib/src/mesa/main/texstate.c index 8ca9092ce..fa1fef27e 100644 --- a/mesalib/src/mesa/main/texstate.c +++ b/mesalib/src/mesa/main/texstate.c @@ -407,7 +407,7 @@ update_tex_combine(struct gl_context *ctx, struct gl_texture_unit *texUnit) GLenum format = texObj->Image[0][texObj->BaseLevel]->_BaseFormat; if (format == GL_DEPTH_COMPONENT || format == GL_DEPTH_STENCIL_EXT) { - format = texObj->Sampler.DepthMode; + format = texObj->DepthMode; } calculate_derived_texenv(&texUnit->_EnvMode, texUnit->EnvMode, format); texUnit->_CurrentCombine = & texUnit->_EnvMode; |