aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-05-02 08:46:34 +0200
committermarha <marha@users.sourceforge.net>2012-05-02 08:46:34 +0200
commite67b35e7a899da5805fcce3d390cb10ebcaffe91 (patch)
tree9323222611fb6ee923d9351df9aead4ee342a8f9 /mesalib/src/mesa/main
parent762b7fde3d57d3a151f98535fd31516b7e823bc0 (diff)
downloadvcxsrv-e67b35e7a899da5805fcce3d390cb10ebcaffe91.tar.gz
vcxsrv-e67b35e7a899da5805fcce3d390cb10ebcaffe91.tar.bz2
vcxsrv-e67b35e7a899da5805fcce3d390cb10ebcaffe91.zip
fontconfig mesa xserver xkeyboard-config git update 2 May 2012
Diffstat (limited to 'mesalib/src/mesa/main')
-rw-r--r--mesalib/src/mesa/main/teximage.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/teximage.c b/mesalib/src/mesa/main/teximage.c
index 23486467d..50095d2c6 100644
--- a/mesalib/src/mesa/main/teximage.c
+++ b/mesalib/src/mesa/main/teximage.c
@@ -2692,6 +2692,13 @@ _mesa_EGLImageTargetTexture2DOES (GLenum target, GLeglImageOES image)
texObj = _mesa_get_current_tex_object(ctx, target);
_mesa_lock_texture(ctx, texObj);
+ if (texObj->Immutable) {
+ _mesa_error(ctx, GL_INVALID_OPERATION,
+ "glEGLImageTargetTexture2D(texture is immutable)");
+ _mesa_unlock_texture(ctx, texObj);
+ return;
+ }
+
texImage = _mesa_get_tex_image(ctx, texObj, target, 0);
if (!texImage) {
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glEGLImageTargetTexture2D");