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/texparam.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/texparam.c')
| -rw-r--r-- | mesalib/src/mesa/main/texparam.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index 1376219d7..9213499a4 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -383,14 +383,14 @@ set_tex_parameteri(struct gl_context *ctx, case GL_DEPTH_TEXTURE_MODE_ARB: if (ctx->Extensions.ARB_depth_texture) { - if (texObj->Sampler.DepthMode == params[0]) + if (texObj->DepthMode == params[0]) return GL_FALSE; if (params[0] == GL_LUMINANCE || params[0] == GL_INTENSITY || params[0] == GL_ALPHA || (ctx->Extensions.ARB_texture_rg && params[0] == GL_RED)) { flush(ctx); - texObj->Sampler.DepthMode = params[0]; + texObj->DepthMode = params[0]; return GL_TRUE; } goto invalid_param; @@ -1157,7 +1157,7 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) case GL_DEPTH_TEXTURE_MODE_ARB: if (!ctx->Extensions.ARB_depth_texture) goto invalid_pname; - *params = (GLfloat) obj->Sampler.DepthMode; + *params = (GLfloat) obj->DepthMode; break; case GL_TEXTURE_LOD_BIAS: *params = obj->Sampler.LodBias; @@ -1303,7 +1303,7 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) case GL_DEPTH_TEXTURE_MODE_ARB: if (!ctx->Extensions.ARB_depth_texture) goto invalid_pname; - *params = (GLint) obj->Sampler.DepthMode; + *params = (GLint) obj->DepthMode; break; case GL_TEXTURE_LOD_BIAS: *params = (GLint) obj->Sampler.LodBias; |