diff options
| author | Dylan Noblesmith <[email protected]> | 2012-04-29 13:23:53 +0000 |
|---|---|---|
| committer | Dylan Noblesmith <[email protected]> | 2012-04-30 14:52:47 +0000 |
| commit | 18bb6852b234a69530a4a6f3ff4e9d33b8e8c7fb (patch) | |
| tree | 95c4b1db76cdf9e4d298be8e5f2ee3b35d8f0278 | |
| parent | 4c23acb269b3d30b9840fcb36edf01410b2f9213 (diff) | |
mesa: reject immutable textures in glEGLImageTargetTexture2DOES()
GL_ARB_texture_storage says:
The commands eglBindTexImage, wglBindTexImageARB, glXBindTexImageEXT or
EGLImageTargetTexture2DOES are not permitted on an immutable-format
texture.
They will generate the following errors:
- EGLImageTargetTexture2DOES: INVALID_OPERATION
- eglBindTexImage: EGL_BAD_MATCH
- wglBindTexImage: ERROR_INVALID_OPERATION
- glXBindTexImageEXT: BadMatch
Fixing the EGL and GLX cases requires extending the DRI interface,
since setTexBuffer2 doesn't currently return any error information.
Reviewed-by: Brian Paul <[email protected]>
| -rw-r--r-- | src/mesa/main/teximage.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 23486467dbc..50095d2c666 100644 --- a/src/mesa/main/teximage.c +++ b/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"); |