[Mesa-dev] [PATCH] Revert "mesa: Return INVALID_OPERATION when type is known but not allowed"

Matt Turner mattst88 at gmail.com
Tue Jan 29 16:37:03 PST 2013


This reverts commit 2906e2034c9d674601960a5b586b6e986e6ef04f.

Reverting this does not affect any tests in es3conform, so a more recent
patch must have also fixed the failure this one was intended to fix.

Reported-by: lu hua <huax.lu at intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59494
---
 src/mesa/main/glformats.c |   12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 6160d8e..8728540 100644
--- a/src/mesa/main/glformats.c
+++ b/src/mesa/main/glformats.c
@@ -1485,18 +1485,8 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
          else if (ctx->Extensions.ARB_depth_buffer_float &&
              type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
             return GL_NO_ERROR;
-         switch (type) {
-         case GL_BYTE:
-         case GL_UNSIGNED_BYTE:
-         case GL_SHORT:
-         case GL_UNSIGNED_SHORT:
-         case GL_INT:
-         case GL_UNSIGNED_INT:
-         case GL_FLOAT:
-            return GL_INVALID_OPERATION;
-         default:
+         else
             return GL_INVALID_ENUM;
-         }
 
       case GL_DUDV_ATI:
       case GL_DU8DV8_ATI:
-- 
1.7.8.6



More information about the mesa-dev mailing list