Mesa (10.1): mesa: Add error condition for format= STENCIL_INDEX in glGetTexImage()

Carl Worth cworth at kemper.freedesktop.org
Fri May 2 00:06:08 UTC 2014


Module: Mesa
Branch: 10.1
Commit: 496dd2ca011a8e1703472d5be4f8ae1ba69495a5
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=496dd2ca011a8e1703472d5be4f8ae1ba69495a5

Author: Anuj Phogat <anuj.phogat at gmail.com>
Date:   Tue Mar 18 16:52:24 2014 -0700

mesa: Add error condition for format=STENCIL_INDEX in glGetTexImage()

>From OpenGL 4.0 spec, page 306:
   "Calling GetTexImage with a format of STENCIL_INDEX
    causes the error INVALID_ENUM."

Cc: <mesa-stable at lists.freedesktop.org>
Signed-off-by: Anuj Phogat <anuj.phogat at gmail.com>
Reviewed-by: Ian Romanick <ian.d.romanick at intel.com>
(cherry picked from commit 5388fc157e2b78d67a05dc923b98857e6449cf1e)

---

 src/mesa/main/texgetimage.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/mesa/main/texgetimage.c b/src/mesa/main/texgetimage.c
index 1cbe0a2..290f333 100644
--- a/src/mesa/main/texgetimage.c
+++ b/src/mesa/main/texgetimage.c
@@ -836,6 +836,11 @@ getteximage_error_check(struct gl_context *ctx, GLenum target, GLint level,
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");
       return GL_TRUE;
    }
+   else if (_mesa_is_stencil_format(format)
+            && !ctx->Extensions.ARB_texture_stencil8) {
+      _mesa_error(ctx, GL_INVALID_ENUM, "glGetTexImage(format=GL_STENCIL_INDEX)");
+      return GL_TRUE;
+   }
    else if (_mesa_is_ycbcr_format(format)
             && !_mesa_is_ycbcr_format(baseFormat)) {
       _mesa_error(ctx, GL_INVALID_OPERATION, "glGetTexImage(format mismatch)");




More information about the mesa-commit mailing list