[Mesa-dev] [PATCH 4/4] mesa: allow multisampled integer texture formats for ES 3.1

[Tapani Pälli]

Signed-off-by: Tapani Pälli <tapani.palli at intel.com>
---
 src/mesa/main/multisample.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/main/multisample.c b/src/mesa/main/multisample.c
index 490bad5..aac5a15 100644
--- a/src/mesa/main/multisample.c
+++ b/src/mesa/main/multisample.c
@@ -164,9 +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."
+    *
+    * OpenGL ES 3.1 allows this.
     */
-   if (_mesa_is_gles3(ctx) && _mesa_is_enum_format_integer(internalFormat)
-       && samples > 0) {
+   if ((ctx->API == API_OPENGLES2 && ctx->Version == 30) &&
+       _mesa_is_enum_format_integer(internalFormat) && samples > 0) {
       return GL_INVALID_OPERATION;
    }
 
-- 
2.1.0