From: Timothy Arceri <t_arceri@yahoo.com.au>
Date: Thu, 13 Aug 2015 08:44:51 +0000 (+1000)
Subject: mesa: move non-generic samples validation
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=46684d3ae3a4084b00355df3feeeb25159656a8e;p=mesa.git

mesa: move non-generic samples validation

The previous patch replaces the other use case.

V2: remove the validation from it old location.

Cc: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
---

diff --git a/src/mesa/main/fbobject.c b/src/mesa/main/fbobject.c
index 841834030df..07db1950bbb 100644
--- a/src/mesa/main/fbobject.c
+++ b/src/mesa/main/fbobject.c
@@ -2033,6 +2033,16 @@ renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb,
        */
       sample_count_error = _mesa_check_sample_count(ctx, GL_RENDERBUFFER,
             internalFormat, samples);
+
+      /* Section 2.5 (GL Errors) of OpenGL 3.0 specification, page 16:
+       *
+       * "If a negative number is provided where an argument of type sizei or
+       * sizeiptr is specified, the error INVALID VALUE is generated."
+       */
+      if (samples < 0) {
+         sample_count_error = GL_INVALID_VALUE;
+      }
+
       if (sample_count_error != GL_NO_ERROR) {
          _mesa_error(ctx, sample_count_error, "%s(samples)", func);
          return;
diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 09e6154f7ec..e7783ea5374 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -150,15 +150,6 @@ GLenum
 _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
                          GLenum internalFormat, GLsizei samples)
 {
-   /* Section 2.5 (GL Errors) of OpenGL 3.0 specification, page 16:
-    *
-    * "If a negative number is provided where an argument of type sizei or
-    * sizeiptr is specified, the error INVALID VALUE is generated."
-    */
-   if (samples < 0) {
-      return GL_INVALID_VALUE;
-   }
-
    /* Section 4.4 (Framebuffer objects), page 198 of the OpenGL ES 3.0.0
     * specification says:
     *