diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-01 11:33:28 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-01 11:55:53 +0200 |
| commit | 28d1f604563d9c738a4c5630364d0e6b4e9b13ff (patch) | |
| tree | 1fbc6bd5cc5a1c950c6dfdf64c348f81604e9e9e /mesalib/src/mesa/main/texparam.c | |
| parent | ced1a6b8f5a750fcd3b8d3d0d9bbdee830064e6c (diff) | |
| download | vcxsrv-28d1f604563d9c738a4c5630364d0e6b4e9b13ff.tar.gz vcxsrv-28d1f604563d9c738a4c5630364d0e6b4e9b13ff.tar.bz2 vcxsrv-28d1f604563d9c738a4c5630364d0e6b4e9b13ff.zip | |
mesa git update 1 Jul 2013
mesa commit bf95ca7de0c02a00a75d1d5e2693a33b68ff784d
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; |