[Mesa-dev] [PATCH 2/4] mesa/clear: simplify ClearBufferiv error handling

[Ilia Mirkin]

Might as well handle everything in the same error call.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
---
 src/mesa/main/clear.c | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/mesa/main/clear.c b/src/mesa/main/clear.c
index 5c40a03..568f600 100644
--- a/src/mesa/main/clear.c
+++ b/src/mesa/main/clear.c
@@ -325,18 +325,6 @@ _mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
       _mesa_update_state( ctx );
    }
 
-   /* Page 498 of the PDF, section '17.4.3.1 Clearing Individual Buffers'
-    * of the OpenGL 4.5 spec states:
-    *
-    *    "An INVALID_ENUM error is generated by ClearBufferiv and
-    *     ClearNamedFramebufferiv if buffer is not COLOR or STENCIL."
-    */
-   if (buffer == GL_DEPTH || buffer == GL_DEPTH_STENCIL) {
-      _mesa_error(ctx, GL_INVALID_ENUM,
-                  "glClearBufferiv(buffer=GL_DEPTH || GL_DEPTH_STENCIL)");
-      return;
-   }
-
    switch (buffer) {
    case GL_STENCIL:
       /* Page 264 (page 280 of the PDF) of the OpenGL 3.0 spec says:
@@ -387,6 +375,12 @@ _mesa_ClearBufferiv(GLenum buffer, GLint drawbuffer, const GLint *value)
       }
       break;
    default:
+      /* Page 498 of the PDF, section '17.4.3.1 Clearing Individual Buffers'
+       * of the OpenGL 4.5 spec states:
+       *
+       *    "An INVALID_ENUM error is generated by ClearBufferiv and
+       *     ClearNamedFramebufferiv if buffer is not COLOR or STENCIL."
+       */
       _mesa_error(ctx, GL_INVALID_ENUM, "glClearBufferiv(buffer=%s)",
                   _mesa_enum_to_string(buffer));
       return;
-- 
2.4.10