From a622e52d29146fe229928d398ebb50373279ae15 Mon Sep 17 00:00:00 2001
From: Paul Lemire <paul.lemire@kdab.com>
Date: Wed, 8 Jul 2020 09:33:28 +0200
Subject: ES2: Clarify warnings about MSAA
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

ES2 supports multisampling, it just doesn't support explicitly disabling
multisample like we could do on desktop with glDisable(GL_MULTISAMPLE);

Change-Id: I4a070e8fec60b038e141a656ddb359f0dbed441d
Reviewed-by: Jean-Michaël Celerier <jean-michael.celerier@kdab.com>
Reviewed-by: Mike Krus <mike.krus@kdab.com>
(cherry picked from commit c3fa82cdcfdddf16efba7cebd0fecd4630a3c20e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
index 3ae9ed932..f485fc57b 100644
--- a/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
+++ b/src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp
@@ -419,8 +419,10 @@ void GraphicsHelperES2::setMSAAEnabled(bool enabled)
     static bool showWarning = true;
     if (!showWarning)
         return;
-    showWarning = false;
-    qWarning() << "MSAA not available with OpenGL ES 2.0";
+    if (!enabled) {
+        showWarning = false;
+        qWarning() << "MSAA cannot be disabled with OpenGL ES 2.0";
+    }
 }
 
 void GraphicsHelperES2::setAlphaCoverageEnabled(bool enabled)
-- 
cgit v1.2.3