aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMartin Peres <[email protected]>2015-02-13 18:14:15 +0200
committerMartin Peres <[email protected]>2015-03-25 10:05:45 +0200
commitfc76fac4199f06e26d6c9b4fbb87b85f802b06f3 (patch)
treebdbd8899320948b0da57a05593f0d51cad208b00 /src
parent7bd8b48084971b1e0d852136e5436776e8ffb044 (diff)
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 <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/mesa/main/multisample.c9
1 files changed, 9 insertions, 0 deletions
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:
*