aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/teximage.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-07-01 11:58:08 +0200
committermarha <marha@users.sourceforge.net>2013-07-01 11:58:08 +0200
commit458ea020a211b25c00c1de9e30e4434213b55f47 (patch)
tree86ce7ba4b2cc9a655d270a877202e129dcca6df3 /mesalib/src/mesa/main/teximage.c
parent6d46609dfd488f9433d0ed10f49d05e31a6fe51e (diff)
parent28d1f604563d9c738a4c5630364d0e6b4e9b13ff (diff)
downloadvcxsrv-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/teximage.c')
-rw-r--r--mesalib/src/mesa/main/teximage.c8
1 files changed, 2 insertions, 6 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 5226687ff..111849655 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -1852,12 +1852,8 @@ legal_texsubimage_target(struct gl_context *ctx, GLuint dims, GLenum target)
static GLboolean
mutable_tex_object(struct gl_context *ctx, GLenum target)
{
- if (ctx->Extensions.ARB_texture_storage) {
- struct gl_texture_object *texObj =
- _mesa_get_current_tex_object(ctx, target);
- return !texObj->Immutable;
- }
- return GL_TRUE;
+ struct gl_texture_object *texObj = _mesa_get_current_tex_object(ctx, target);
+ return !texObj->Immutable;
}