From: Martin Peres <martin.peres@linux.intel.com>
Date: Fri, 13 Feb 2015 16:14:15 +0000 (+0200)
Subject: main: fix the validation of the number of samples
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=fc76fac4199f06e26d6c9b4fbb87b85f802b06f3;p=mesa.git

main: fix the validation of the number of samples

Maybe this should be the job of the dispatch layer.

v2:
- add the section name and pdf page number of the quote (Laura)
- OpenGL 3.0 core does not exist, get rid of "core"

Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
---

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 0e9207bc16e..816837b95bd 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -150,6 +150,15 @@ 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:
     *