From: Matt Turner <mattst88@gmail.com>
Date: Wed, 30 Jan 2013 00:35:30 +0000 (-0800)
Subject: Revert "mesa: Return INVALID_OPERATION when type is known but not allowed"
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a527b2192e3cb4a68af927ab405e38181d2fcf75;p=mesa.git

Revert "mesa: Return INVALID_OPERATION when type is known but not allowed"

This reverts commit 2906e2034c9d674601960a5b586b6e986e6ef04f.

Fixes a regression in the glean depthStencil test.

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@intel.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=59494
---

diff --git a/src/mesa/main/glformats.c b/src/mesa/main/glformats.c
index 6160d8ecdd9..8728540cf35 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: