Rename new QOpenGLContext APIs

isES() becomes isOpenGLES(). The library type enums are changed
DesktopGL -> LibGL and GLES2 -> LibGLES. This removes the now
unnecessary version number, the confusing "desktop" term and provides
better readability.

The old function/values are kept until the related qtdeclarative
changes are integrated.

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

1 files changed, 6 insertions, 6 deletions

diff --git a/src/opengl/qglshaderprogram.cpp b/src/opengl/qglshaderprogram.cpp
index 65f217edf2..6173ad1288 100644
--- a/src/opengl/qglshaderprogram.cpp
+++ b/src/opengl/qglshaderprogram.cpp
@@ -248,7 +248,7 @@ bool QGLShaderPrivate::create()
             shader = glfuncs->glCreateShader(GL_VERTEX_SHADER);
 #if !defined(QT_OPENGL_ES_2)
         else if (shaderType == QGLShader::Geometry
-                 && !context->contextHandle()->isES())
+                 && !context->contextHandle()->isOpenGLES())
             shader = glfuncs->glCreateShader(GL_GEOMETRY_SHADER_EXT);
 #endif
         else
@@ -430,14 +430,14 @@ bool QGLShader::compileSourceCode(const char *source)
             srclen.append(GLint(headerLen));
         }
 #ifdef QGL_DEFINE_QUALIFIERS
-        if (!QOpenGLContext::currentContext()->isES()) {
+        if (!QOpenGLContext::currentContext()->isOpenGLES()) {
             src.append(qualifierDefines);
             srclen.append(GLint(sizeof(qualifierDefines) - 1));
         }
 #endif
 #ifdef QGL_REDEFINE_HIGHP
         if (d->shaderType == Fragment
-            && QOpenGLContext::currentContext()->isES()) {
+            && QOpenGLContext::currentContext()->isOpenGLES()) {
             src.append(redefineHighp);
             srclen.append(GLint(sizeof(redefineHighp) - 1));
         }
@@ -568,7 +568,7 @@ public:
     void initializeGeometryShaderFunctions()
     {
         QOpenGLContext *context = QOpenGLContext::currentContext();
-        if (!context->isES()) {
+        if (!context->isOpenGLES()) {
             glProgramParameteri = (type_glProgramParameteri)
                 context->getProcAddress("glProgramParameteri");
 
@@ -936,7 +936,7 @@ bool QGLShaderProgram::link()
 
 #if !defined(QT_OPENGL_ES_2)
     // Set up the geometry shader parameters
-    if (!QOpenGLContext::currentContext()->isES()
+    if (!QOpenGLContext::currentContext()->isOpenGLES()
         && d->glfuncs->glProgramParameteri) {
         foreach (QGLShader *shader, d->shaders) {
             if (shader->shaderType() & QGLShader::Geometry) {
@@ -3074,7 +3074,7 @@ int QGLShaderProgram::maxGeometryOutputVertices() const
 {
     GLint n = 0;
 #if !defined(QT_OPENGL_ES_2)
-    if (!QOpenGLContext::currentContext()->isES())
+    if (!QOpenGLContext::currentContext()->isOpenGLES())
         glGetIntegerv(GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT, &n);
 #endif
     return n;