diff options
author | marha <marha@users.sourceforge.net> | 2013-07-01 11:58:08 +0200 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2013-07-01 11:58:08 +0200 |
commit | 458ea020a211b25c00c1de9e30e4434213b55f47 (patch) | |
tree | 86ce7ba4b2cc9a655d270a877202e129dcca6df3 /mesalib/src/mesa/main/texparam.c | |
parent | 6d46609dfd488f9433d0ed10f49d05e31a6fe51e (diff) | |
parent | 28d1f604563d9c738a4c5630364d0e6b4e9b13ff (diff) | |
download | vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.tar.gz vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.tar.bz2 vcxsrv-458ea020a211b25c00c1de9e30e4434213b55f47.zip |
Merge remote-tracking branch 'origin/released'
* origin/released:
mesa git update 1 Jul 2013
Diffstat (limited to 'mesalib/src/mesa/main/texparam.c')
-rw-r--r-- | mesalib/src/mesa/main/texparam.c | 20 |
1 files changed, 5 insertions, 15 deletions
diff --git a/mesalib/src/mesa/main/texparam.c b/mesalib/src/mesa/main/texparam.c index 9507bc394..cf9a3014c 100644 --- a/mesalib/src/mesa/main/texparam.c +++ b/mesalib/src/mesa/main/texparam.c @@ -176,12 +176,12 @@ get_texobj(struct gl_context *ctx, GLenum target, GLboolean get) } break; case GL_TEXTURE_2D_MULTISAMPLE: - if (ctx->Extensions.ARB_texture_storage_multisample) { + if (ctx->Extensions.ARB_texture_multisample) { return texUnit->CurrentTex[TEXTURE_2D_MULTISAMPLE_INDEX]; } break; case GL_TEXTURE_2D_MULTISAMPLE_ARRAY: - if (ctx->Extensions.ARB_texture_storage_multisample) { + if (ctx->Extensions.ARB_texture_multisample) { return texUnit->CurrentTex[TEXTURE_2D_MULTISAMPLE_ARRAY_INDEX]; } break; @@ -446,21 +446,15 @@ set_tex_parameteri(struct gl_context *ctx, switch (params[0]) { case GL_LEQUAL: case GL_GEQUAL: - flush(ctx); - texObj->Sampler.CompareFunc = params[0]; - return GL_TRUE; case GL_EQUAL: case GL_NOTEQUAL: case GL_LESS: case GL_GREATER: case GL_ALWAYS: case GL_NEVER: - if (ctx->Extensions.EXT_shadow_funcs) { - flush(ctx); - texObj->Sampler.CompareFunc = params[0]; - return GL_TRUE; - } - /* fall-through */ + flush(ctx); + texObj->Sampler.CompareFunc = params[0]; + return GL_TRUE; default: goto invalid_param; } @@ -1541,8 +1535,6 @@ _mesa_GetTexParameterfv( GLenum target, GLenum pname, GLfloat *params ) break; case GL_TEXTURE_IMMUTABLE_FORMAT: - if (!ctx->Extensions.ARB_texture_storage) - goto invalid_pname; *params = (GLfloat) obj->Immutable; break; @@ -1724,8 +1716,6 @@ _mesa_GetTexParameteriv( GLenum target, GLenum pname, GLint *params ) break; case GL_TEXTURE_IMMUTABLE_FORMAT: - if (!ctx->Extensions.ARB_texture_storage) - goto invalid_pname; *params = (GLint) obj->Immutable; break; |