From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Fri, 12 Feb 2016 17:56:10 +0000 (-0500)
Subject: mesa/clear: update ClearBufferuiv error handling for GL 4.5 spec
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3a0051bea998dc26feed9ed1468714b89de417c3;p=mesa.git

mesa/clear: update ClearBufferuiv error handling for GL 4.5 spec

This fixes

dEQP-GLES31.functional.debug.negative_coverage.get_error.buffer.clear_bufferuiv

and brings the logic up to spec with GL 4.5

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
Reviewed-by: Brian Paul <brianp@vmware.com>
---

diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index 568f600a55e..9dbac3ee6a7 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -445,32 +445,13 @@ _mesa_ClearBufferuiv(GLenum buffer, GLint drawbuffer, const GLuint *value)
          }
       }
       break;
-   case GL_DEPTH:
-   case GL_STENCIL:
-      /* Page 264 (page 280 of the PDF) of the OpenGL 3.0 spec says:
-       *
-       *     "The result of ClearBuffer is undefined if no conversion between
-       *     the type of the specified value and the type of the buffer being
-       *     cleared is defined (for example, if ClearBufferiv is called for a
-       *     fixed- or floating-point buffer, or if ClearBufferfv is called
-       *     for a signed or unsigned integer buffer). This is not an error."
-       *
-       * In this case we take "undefined" and "not an error" to mean "ignore."
-       * Even though we could do something sensible for GL_STENCIL, page 263
-       * (page 279 of the PDF) says:
-       *
-       *     "Only ClearBufferiv should be used to clear stencil buffers."
+   default:
+      /* Page 498 of the PDF, section '17.4.3.1 Clearing Individual Buffers'
+       * of the OpenGL 4.5 spec states:
        *
-       * Note that we still need to generate an error for the invalid
-       * drawbuffer case (see the GL_STENCIL case in _mesa_ClearBufferiv).
+       *    "An INVALID_ENUM error is generated by ClearBufferuiv and
+       *     ClearNamedFramebufferuiv if buffer is not COLOR."
        */
-      if (drawbuffer != 0) {
-         _mesa_error(ctx, GL_INVALID_VALUE, "glClearBufferuiv(drawbuffer=%d)",
-                     drawbuffer);
-         return;
-      }
-      return;
-   default:
       _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferuiv(buffer=%s)",
                   _mesa_enum_to_string(buffer));
       return;