diff options
| author | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-05-02 09:01:55 +0200 |
| commit | 3d353f31ac1671d1b39c09b1f8d82c8811d3edd6 (patch) | |
| tree | ce19dbcec75ce7e87547f6f9b3495888aaea0966 /mesalib/src/mesa/main/teximage.c | |
| parent | b2a0f04a2984b290c1224fc1b1883d08b01a6231 (diff) | |
| parent | e67b35e7a899da5805fcce3d390cb10ebcaffe91 (diff) | |
| download | vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.gz vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.tar.bz2 vcxsrv-3d353f31ac1671d1b39c09b1f8d82c8811d3edd6.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/os/connection.c
Diffstat (limited to 'mesalib/src/mesa/main/teximage.c')
| -rw-r--r-- | mesalib/src/mesa/main/teximage.c | 7 |
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"); |