From: Marta Lofstedt <marta.lofstedt@intel.com>
Date: Mon, 15 Jun 2015 11:50:21 +0000 (+0200)
Subject: mesa/es3.1: Pass sample count check for multisampled textures
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b6d014f0ba010f0e61be43abdceb5f2201028a04;p=mesa.git

mesa/es3.1: Pass sample count check for multisampled textures

v3 : Removed space in comment.

Signed-off-by: Marta Lofstedt <marta.lofstedt@intel.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
---

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 490bad507c3..09e6154f7ec 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -164,8 +164,11 @@ _mesa_check_sample_count(struct gl_context *ctx, GLenum target,
     *
     *     "If internalformat is a signed or unsigned integer format and samples
     *     is greater than zero, then the error INVALID_OPERATION is generated."
+    *
+    * This restriction is relaxed for OpenGL ES 3.1.
     */
-   if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat)
+   if ((ctx->API == API_OPENGLES2 && ctx->Version == 30) &&
+       _mesa_is_enum_format_integer(internalFormat)
        && samples > 0) {
       return GL_INVALID_OPERATION;
    }