Move versioned OpenGL functions from QtGui to QtOpenGL

The context—which lives in QtGui—now knows nothing about versioned functions.

This changes the public API for getting version functions for a context.

[ChangeLog][QtGui][OpenGL] QOpenGLContext::versionFunctions() has been removed.
QOpenGLVersionFunctionsFactory::get() from the QtOpenGL module should be used
instead.

Previously one would call

    context->versionFunctions<QOpenGLFunctions_4_0_Core>();

Which now becomes

    QOpenGLVersionFunctionsFactory::get<QOpenGLFunctions_4_0_Core>(context);

The rest of the API should be identical.

Since glgen no longer compiles, and the links to its input (gl.spec and gl.tm)
are dead, I've edited the previously generated files manually. If glgen is
fixed, it should be quite easy to make it generate the new way.

Task-number: QTBUG-74409
Change-Id: I800527e0af16a79005b276eeb74417770193c62f
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

1 files changed, 36 insertions, 8 deletions

diff --git a/src/opengl/.prev_CMakeLists.txt b/src/opengl/.prev_CMakeLists.txt
index eb125273bc..569fe18fc4 100644
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@@ -7,20 +7,28 @@
 qt_add_module(OpenGL
     SOURCES
         qopengl2pexvertexarray.cpp qopengl2pexvertexarray_p.h
+        qopenglbuffer.cpp qopenglbuffer.h
         qopenglcustomshaderstage.cpp qopenglcustomshaderstage_p.h
         qopengldebug.cpp qopengldebug.h
         qopenglengineshadermanager.cpp qopenglengineshadermanager_p.h
         qopenglengineshadersource_p.h
+        qopenglframebufferobject.cpp qopenglframebufferobject.h qopenglframebufferobject_p.h
         qopenglgradientcache.cpp qopenglgradientcache_p.h
         qopenglpaintdevice.cpp qopenglpaintdevice.h qopenglpaintdevice_p.h
         qopenglpaintengine.cpp qopenglpaintengine_p.h
         qopenglpixeltransferoptions.cpp qopenglpixeltransferoptions.h
         qopenglshadercache_p.h
+        qopenglshaderprogram.cpp qopenglshaderprogram.h
         qopengltexture.cpp qopengltexture.h qopengltexture_p.h
+        qopengltextureblitter.cpp qopengltextureblitter.h
         qopengltexturecache.cpp qopengltexturecache_p.h
         qopengltextureglyphcache.cpp qopengltextureglyphcache_p.h
         qopengltexturehelper.cpp qopengltexturehelper_p.h
         qopengltextureuploader.cpp qopengltextureuploader_p.h
+        qopenglversionfunctions.cpp qopenglversionfunctions.h qopenglversionfunctions_p.h
+        qopenglversionfunctionsfactory.cpp qopenglversionfunctionsfactory.h
+        qopenglversionprofile.cpp qopenglversionprofile.h
+        qopenglvertexarrayobject.cpp qopenglvertexarrayobject.h
         qopenglwindow.cpp qopenglwindow.h
         qtopenglglobal.h
     DEFINES
@@ -40,19 +48,39 @@ qt_add_module(OpenGL
 ## Scopes:
 #####################################################################
 
-qt_extend_target(OpenGL CONDITION QT_FEATURE_widgets
+qt_extend_target(OpenGL CONDITION QT_FEATURE_opengles2
     SOURCES
-        qopenglwidget.cpp qopenglwidget.h
-    LIBRARIES
-        Qt::WidgetsPrivate
-    PUBLIC_LIBRARIES
-        Qt::Widgets
-    PRIVATE_MODULE_INTERFACE
-        Qt::WidgetsPrivate
+        opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h
 )
 
 qt_extend_target(OpenGL CONDITION NOT QT_FEATURE_opengles2
     SOURCES
+        qopenglfunctions_1_0.cpp qopenglfunctions_1_0.h
+        qopenglfunctions_1_1.cpp qopenglfunctions_1_1.h
+        qopenglfunctions_1_2.cpp qopenglfunctions_1_2.h
+        qopenglfunctions_1_3.cpp qopenglfunctions_1_3.h
+        qopenglfunctions_1_4.cpp qopenglfunctions_1_4.h
+        qopenglfunctions_1_5.cpp qopenglfunctions_1_5.h
+        qopenglfunctions_2_0.cpp qopenglfunctions_2_0.h
+        qopenglfunctions_2_1.cpp qopenglfunctions_2_1.h
+        qopenglfunctions_3_0.cpp qopenglfunctions_3_0.h
+        qopenglfunctions_3_1.cpp qopenglfunctions_3_1.h
+        qopenglfunctions_3_2_compatibility.cpp qopenglfunctions_3_2_compatibility.h
+        qopenglfunctions_3_2_core.cpp qopenglfunctions_3_2_core.h
+        qopenglfunctions_3_3_compatibility.cpp qopenglfunctions_3_3_compatibility.h
+        qopenglfunctions_3_3_core.cpp qopenglfunctions_3_3_core.h
+        qopenglfunctions_4_0_compatibility.cpp qopenglfunctions_4_0_compatibility.h
+        qopenglfunctions_4_0_core.cpp qopenglfunctions_4_0_core.h
+        qopenglfunctions_4_1_compatibility.cpp qopenglfunctions_4_1_compatibility.h
+        qopenglfunctions_4_1_core.cpp qopenglfunctions_4_1_core.h
+        qopenglfunctions_4_2_compatibility.cpp qopenglfunctions_4_2_compatibility.h
+        qopenglfunctions_4_2_core.cpp qopenglfunctions_4_2_core.h
+        qopenglfunctions_4_3_compatibility.cpp qopenglfunctions_4_3_compatibility.h
+        qopenglfunctions_4_3_core.cpp qopenglfunctions_4_3_core.h
+        qopenglfunctions_4_4_compatibility.cpp qopenglfunctions_4_4_compatibility.h
+        qopenglfunctions_4_4_core.cpp qopenglfunctions_4_4_core.h
+        qopenglfunctions_4_5_compatibility.cpp qopenglfunctions_4_5_compatibility.h
+        qopenglfunctions_4_5_core.cpp qopenglfunctions_4_5_core.h
         qopenglqueryhelper_p.h
         qopengltimerquery.cpp qopengltimerquery.h
 )