Mesa (master): mesa/es3.1: Pass sample count check for multisampled textures

[Tapani Pälli]

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

Author: Marta Lofstedt <marta.lofstedt at intel.com>
Date:   Mon Jun 15 13:50:21 2015 +0200

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

v3 : Removed space in comment.

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

---

 src/mesa/main/multisample.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 490bad5..09e6154 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;
    }