Mesa (master): mesa: Adds check for integer internal format and num samples in glRenderbufferStorageMultisample

[Samuel Iglesias Gonsálvez]

Module: Mesa
Branch: master
Commit: 19252fee46b835cb4f6b1cce18d7737d62b64a2e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=19252fee46b835cb4f6b1cce18d7737d62b64a2e

Author: Eduardo Lima Mitev <elima at igalia.com>
Date:   Mon Dec 15 11:30:21 2014 +0100

mesa: Adds check for integer internal format and num samples in glRenderbufferStorageMultisample

Per GLES3 specification, section 4.4 Framebuffer objects page 198, "If
internalformat is a signed or unsigned integer format and samples is greater
than zero, then the error INVALID_OPERATION is generated.".

Fixes 1 dEQP test:
* dEQP-GLES3.functional.negative_api.buffer.renderbuffer_storage_multisample

Reviewed-by: Matt Turner <mattst88 at gmail.com>

---

 src/mesa/main/multisample.c |   10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 1f3fa0c..b696de9 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -150,6 +150,16 @@ GLenum
 _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
                          GLenum internalFormat, GLsizei samples)
 {
+   /* Section 4.4 (Framebuffer objects) of the OpenGL 3.0 specification says:
+    *
+    *     "If internalformat is a signed or unsigned integer format and samples
+    *     is greater than zero, then the error INVALID_OPERATION is generated."
+    */
+   if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat)) {
+      return GL_INVALID_OPERATION;
+   }
+
+
    /* If ARB_internalformat_query is supported, then treat its highest
     * returned sample count as the absolute maximum for this format; it is
     * allowed to exceed MAX_SAMPLES.