summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Lemire <paul.lemire@kdab.com>2020-07-08 09:33:28 +0200
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2020-07-10 13:56:38 +0000
commita622e52d29146fe229928d398ebb50373279ae15 (patch)
tree176f02c5449dfa9f6a7a7e9a8983e785a9c9e785
parent85c21500c52fe4cbfa1aa9d556296f85abc062b9 (diff)
ES2: Clarify warnings about MSAA
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>
-rw-r--r--src/plugins/renderers/opengl/graphicshelpers/graphicshelperes2.cpp6
1 files 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)