Follow QOpenGLContext API renaming

Task-number: QTBUG-38564
Change-Id: Ice1170339f7d650fcb6accfccf325471629343d6
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

diff --git a/src/particles/qquickcustomparticle.cpp b/src/particles/qquickcustomparticle.cpp
index c112283..d3e5e41 100644 (file)
--- a/src/particles/qquickcustomparticle.cpp
+++ b/src/particles/qquickcustomparticle.cpp
@@ -269,7 +269,7 @@ QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffec
         return 0;
 
     if (m_dirtyProgram) {
-        const bool isES = QOpenGLContext::currentContext()->isES();
+        const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
         QQuickShaderEffectMaterial *material = static_cast<QQuickShaderEffectMaterial *>(rootNode->material());
         Q_ASSERT(material);
@@ -311,7 +311,7 @@ QQuickShaderEffectNode *QQuickCustomParticle::prepareNextFrame(QQuickShaderEffec
 
 QQuickShaderEffectNode* QQuickCustomParticle::buildCustomNodes()
 {
-    if (QOpenGLContext::currentContext()->isES() && m_count * 4 > 0xffff) {
+    if (QOpenGLContext::currentContext()->isOpenGLES() && m_count * 4 > 0xffff) {
         printf("CustomParticle: Too many particles... \n");
         return 0;
     }

diff --git a/src/particles/qquickimageparticle.cpp b/src/particles/qquickimageparticle.cpp
index f7f0b66..5efa7b4 100644 (file)
--- a/src/particles/qquickimageparticle.cpp
+++ b/src/particles/qquickimageparticle.cpp
@@ -100,7 +100,7 @@ public:
     TabledMaterial()
     {
         QSGShaderSourceBuilder builder;
-        const bool isES = QOpenGLContext::currentContext()->isES();
+        const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
         builder.appendSourceFile(QStringLiteral(":/particles/shaders/imageparticle.vert"));
         builder.addDefinition(QByteArray(SHADER_PLATFORM_DEFINES));
@@ -178,7 +178,7 @@ public:
     DeformableMaterial()
     {
         QSGShaderSourceBuilder builder;
-        const bool isES = QOpenGLContext::currentContext()->isES();
+        const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
         builder.appendSourceFile(QStringLiteral(":/particles/shaders/imageparticle.vert"));
         builder.addDefinition(QByteArray(SHADER_PLATFORM_DEFINES));
@@ -243,7 +243,7 @@ public:
     SpriteMaterial()
     {
         QSGShaderSourceBuilder builder;
-        const bool isES = QOpenGLContext::currentContext()->isES();
+        const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
         builder.appendSourceFile(QStringLiteral(":/particles/shaders/imageparticle.vert"));
         builder.addDefinition(QByteArray(SHADER_PLATFORM_DEFINES));
@@ -325,7 +325,7 @@ public:
     ColoredMaterial()
     {
         QSGShaderSourceBuilder builder;
-        const bool isES = QOpenGLContext::currentContext()->isES();
+        const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
         builder.appendSourceFile(QStringLiteral(":/particles/shaders/imageparticle.vert"));
         builder.addDefinition(QByteArray(SHADER_PLATFORM_DEFINES));
@@ -403,7 +403,7 @@ public:
     SimpleMaterial()
     {
         QSGShaderSourceBuilder builder;
-        const bool isES = QOpenGLContext::currentContext()->isES();
+        const bool isES = QOpenGLContext::currentContext()->isOpenGLES();
 
         builder.appendSourceFile(QStringLiteral(":/particles/shaders/imageparticle.vert"));
         builder.addDefinition(QByteArray(SHADER_PLATFORM_DEFINES));
@@ -1231,7 +1231,7 @@ void QQuickImageParticle::buildParticleNodes(QSGNode** passThrough)
 
 void QQuickImageParticle::finishBuildParticleNodes(QSGNode** node)
 {
-    if (QOpenGLContext::currentContext()->isES() && m_count * 4 > 0xffff) {
+    if (QOpenGLContext::currentContext()->isOpenGLES() && m_count * 4 > 0xffff) {
         printf("ImageParticle: Too many particles - maximum 16,000 per ImageParticle.\n");//ES 2 vertex count limit is ushort
         return;
     }

diff --git a/src/quick/designer/designersupport.cpp b/src/quick/designer/designersupport.cpp
index 99dcf2c..82f7963 100644 (file)
--- a/src/quick/designer/designersupport.cpp
+++ b/src/quick/designer/designersupport.cpp
@@ -94,7 +94,7 @@ void DesignerSupport::refFromEffectItem(QQuickItem *referencedItem, bool hide)
         texture->setSize(referencedItem->boundingRect().size().toSize());
         texture->setRecursive(true);
 #ifndef QT_OPENGL_ES
-        if (QOpenGLContext::openGLModuleType() == QOpenGLContext::DesktopGL)
+        if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGL)
             texture->setFormat(GL_RGBA8);
         else
             texture->setFormat(GL_RGBA);

diff --git a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
index 265ca55..e8f803f 100644 (file)
--- a/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
+++ b/src/quick/scenegraph/coreapi/qsgbatchrenderer.cpp
@@ -2191,7 +2191,7 @@ void Renderer::renderUnmergedBatch(const Batch *batch)
         if (g->drawingMode() == GL_LINE_STRIP || g->drawingMode() == GL_LINE_LOOP || g->drawingMode() == GL_LINES)
             glLineWidth(g->lineWidth());
 #if !defined(QT_OPENGL_ES_2)
-        else if (!QOpenGLContext::currentContext()->isES() && g->drawingMode() == GL_POINTS)
+        else if (!QOpenGLContext::currentContext()->isOpenGLES() && g->drawingMode() == GL_POINTS)
             glPointSize(g->lineWidth());
 #endif
 

diff --git a/src/quick/scenegraph/qsgcontext.cpp b/src/quick/scenegraph/qsgcontext.cpp
index 2d2b643..64506d1 100644 (file)
--- a/src/quick/scenegraph/qsgcontext.cpp
+++ b/src/quick/scenegraph/qsgcontext.cpp
@@ -198,7 +198,7 @@ void QSGContext::renderContextInitialized(QSGRenderContext *renderContext)
     if (!d->distanceFieldAntialiasingDecided) {
         d->distanceFieldAntialiasingDecided = true;
 #ifndef Q_OS_WIN
-        if (renderContext->openglContext()->isES())
+        if (renderContext->openglContext()->isOpenGLES())
             d->distanceFieldAntialiasing = QSGGlyphNode::GrayAntialiasing;
 #endif
     }

diff --git a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
index 18142cc..48b4054 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
+++ b/src/quick/scenegraph/qsgdefaultdistancefieldglyphcache.cpp
@@ -231,7 +231,7 @@ void QSGDefaultDistanceFieldGlyphCache::createTexture(TextureInfo *texInfo, int
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 #if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isES())
+    if (!QOpenGLContext::currentContext()->isOpenGLES())
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
     const GLint internalFormat = isCoreProfile() ? GL_R8 : GL_ALPHA;
     const GLenum format = isCoreProfile() ? GL_RED : GL_ALPHA;
@@ -374,7 +374,7 @@ void QSGDefaultDistanceFieldGlyphCache::resizeTexture(TextureInfo *texInfo, int
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 #if !defined(QT_OPENGL_ES_2)
-    if (!ctx->isES())
+    if (!ctx->isOpenGLES())
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 #endif
     glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, oldWidth, oldHeight, 0,

diff --git a/src/quick/scenegraph/qsgdefaultimagenode.cpp b/src/quick/scenegraph/qsgdefaultimagenode.cpp
index 9113d1e..d925b1c 100644 (file)
--- a/src/quick/scenegraph/qsgdefaultimagenode.cpp
+++ b/src/quick/scenegraph/qsgdefaultimagenode.cpp
@@ -362,7 +362,7 @@ void QSGDefaultImageNode::updateGeometry()
 
         QOpenGLContext *ctx = QOpenGLContext::currentContext();
 #ifndef QT_OPENGL_ES_2
-        if (ctx->isES())
+        if (ctx->isOpenGLES())
 #endif
         {
             bool npotSupported = ctx->functions()->hasOpenGLFeature(QOpenGLFunctions::NPOTTextureRepeat);

diff --git a/src/quick/scenegraph/qsgrenderloop.cpp b/src/quick/scenegraph/qsgrenderloop.cpp
index 808bf07..e76aa1b 100644 (file)
--- a/src/quick/scenegraph/qsgrenderloop.cpp
+++ b/src/quick/scenegraph/qsgrenderloop.cpp
@@ -332,7 +332,7 @@ void QSGGuiThreadRenderLoop::renderWindow(QQuickWindow *window)
         if (QOpenGLContextPrivate::globalShareContext())
             gl->setShareContext(QOpenGLContextPrivate::globalShareContext());
         if (!gl->create()) {
-            const bool isEs = gl->isES();
+            const bool isEs = gl->isOpenGLES();
             delete gl;
             gl = 0;
             handleContextCreationFailure(window, isEs);

diff --git a/src/quick/scenegraph/qsgthreadedrenderloop.cpp b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
index 3ded6b8..0aa3028 100644 (file)
--- a/src/quick/scenegraph/qsgthreadedrenderloop.cpp
+++ b/src/quick/scenegraph/qsgthreadedrenderloop.cpp
@@ -954,7 +954,7 @@ void QSGThreadedRenderLoop::handleExposure(Window *w)
                 w->thread->gl->setShareContext(QOpenGLContextPrivate::globalShareContext());
             w->thread->gl->setFormat(w->window->requestedFormat());
             if (!w->thread->gl->create()) {
-                const bool isEs = w->thread->gl->isES();
+                const bool isEs = w->thread->gl->isOpenGLES();
                 delete w->thread->gl;
                 w->thread->gl = 0;
                 handleContextCreationFailure(w->window, isEs);

diff --git a/src/quick/scenegraph/qsgwindowsrenderloop.cpp b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
index 531f7c7..e20f9cd 100644 (file)
--- a/src/quick/scenegraph/qsgwindowsrenderloop.cpp
+++ b/src/quick/scenegraph/qsgwindowsrenderloop.cpp
@@ -183,7 +183,7 @@ void QSGWindowsRenderLoop::show(QQuickWindow *window)
             m_gl->setShareContext(QOpenGLContextPrivate::globalShareContext());
         bool created = m_gl->create();
         if (!created) {
-            const bool isEs = m_gl->isES();
+            const bool isEs = m_gl->isOpenGLES();
             delete m_gl;
             m_gl = 0;
             handleContextCreationFailure(window, isEs);

diff --git a/src/quick/scenegraph/util/qsgatlastexture.cpp b/src/quick/scenegraph/util/qsgatlastexture.cpp
index b0787e9..c47fd8c 100644 (file)
--- a/src/quick/scenegraph/util/qsgatlastexture.cpp
+++ b/src/quick/scenegraph/util/qsgatlastexture.cpp
@@ -147,7 +147,7 @@ Atlas::Atlas(const QSize &size)
     m_externalFormat = GL_BGRA;
 
 #ifndef QT_OPENGL_ES
-    if (QOpenGLContext::currentContext()->isES()) {
+    if (QOpenGLContext::currentContext()->isOpenGLES()) {
 #endif
 
 #if defined(Q_OS_ANDROID) && !defined(Q_OS_ANDROID_NO_SDK)
@@ -334,7 +334,7 @@ void Atlas::bind(QSGTexture::Filtering filtering)
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
         glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
 #if !defined(QT_OPENGL_ES_2)
-        if (!QOpenGLContext::currentContext()->isES())
+        if (!QOpenGLContext::currentContext()->isOpenGLES())
             glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0);
 #endif
         glTexImage2D(GL_TEXTURE_2D, 0, m_internalFormat, m_size.width(), m_size.height(), 0, m_externalFormat, GL_UNSIGNED_BYTE, 0);

diff --git a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
index db8ed03..f5a75fd 100644 (file)
--- a/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
+++ b/src/quick/scenegraph/util/qsgdepthstencilbuffer.cpp
@@ -115,7 +115,7 @@ QSGDefaultDepthStencilBuffer::QSGDefaultDepthStencilBuffer(QOpenGLContext *conte
         m_functions.glGenRenderbuffers(1, &m_depthBuffer);
         m_functions.glBindRenderbuffer(GL_RENDERBUFFER, m_depthBuffer);
         GLenum internalFormat = GL_DEPTH_COMPONENT;
-        if (context->isES())
+        if (context->isOpenGLES())
             internalFormat = m_functions.hasOpenGLExtension(QOpenGLExtensions::Depth24)
                 ? GL_DEPTH_COMPONENT24_OES : GL_DEPTH_COMPONENT16;
         if (format.samples && m_functions.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) {
@@ -131,7 +131,7 @@ QSGDefaultDepthStencilBuffer::QSGDefaultDepthStencilBuffer(QOpenGLContext *conte
 #ifdef QT_OPENGL_ES
         const GLenum internalFormat = GL_STENCIL_INDEX8;
 #else
-        const GLenum internalFormat = context->isES() ? GL_STENCIL_INDEX8 : GL_STENCIL_INDEX;
+        const GLenum internalFormat = context->isOpenGLES() ? GL_STENCIL_INDEX8 : GL_STENCIL_INDEX;
 #endif
         if (format.samples && m_functions.hasOpenGLExtension(QOpenGLExtensions::FramebufferMultisample)) {
             m_functions.glRenderbufferStorageMultisample(GL_RENDERBUFFER, format.samples,

diff --git a/src/quick/scenegraph/util/qsgtexture.cpp b/src/quick/scenegraph/util/qsgtexture.cpp
index c6e5f7a..cd0b64f 100644 (file)
--- a/src/quick/scenegraph/util/qsgtexture.cpp
+++ b/src/quick/scenegraph/util/qsgtexture.cpp
@@ -689,7 +689,7 @@ void QSGPlainTexture::bind()
 #ifdef QT_OPENGL_ES
         internalFormat = GL_BGRA;
 #else
-        if (context->isES())
+        if (context->isOpenGLES())
             internalFormat = GL_BGRA;
 #endif // QT_OPENGL_ES
     } else if (!wrongfullyReportsBgra8888Support

diff --git a/src/quickwidgets/qquickwidget.cpp b/src/quickwidgets/qquickwidget.cpp
index b6d72ac..e20e5f2 100644 (file)
--- a/src/quickwidgets/qquickwidget.cpp
+++ b/src/quickwidgets/qquickwidget.cpp
@@ -603,7 +603,7 @@ void QQuickWidgetPrivate::createContext()
     if (QOpenGLContextPrivate::globalShareContext())
         context->setShareContext(QOpenGLContextPrivate::globalShareContext());
     if (!context->create()) {
-        const bool isEs = context->isES();
+        const bool isEs = context->isOpenGLES();
         delete context;
         context = 0;
         handleContextCreationFailure(offscreenWindow->requestedFormat(), isEs);

diff --git a/tests/auto/quick/qquickitem/tst_qquickitem.cpp b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
index 6f11986..2db510a 100644 (file)
--- a/tests/auto/quick/qquickitem/tst_qquickitem.cpp
+++ b/tests/auto/quick/qquickitem/tst_qquickitem.cpp
@@ -1190,7 +1190,7 @@ static inline QByteArray msgItem(const QQuickItem *item)
 void tst_qquickitem::mouseGrab()
 {
 #ifdef Q_OS_WIN
-    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::GLES2)
+    if (QOpenGLContext::openGLModuleType() == QOpenGLContext::LibGLES)
         QSKIP("Fails in the CI for ANGLE builds on Windows, QTBUG-32664");
 #endif
     QQuickWindow window;