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, 3 insertions, 41 deletions

diff --git a/src/gui/.prev_CMakeLists.txt b/src/gui/.prev_CMakeLists.txt
index 7754f19d49..d1464e2966 100644
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@@ -260,9 +260,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_opengl
         opengl/qopenglextrafunctions.h
         opengl/qopenglfunctions.cpp opengl/qopenglfunctions.h
         opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache_p.h
-        opengl/qopenglversionfunctions.cpp opengl/qopenglversionfunctions.h
-        opengl/qopenglversionfunctionsfactory.cpp opengl/qopenglversionfunctionsfactory_p.h
-        opengl/qopenglversionprofile.cpp opengl/qopenglversionprofile.h
         rhi/qrhigles2.cpp rhi/qrhigles2_p.h
         rhi/qrhigles2_p_p.h
 )
@@ -569,41 +566,6 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
         util/qundogroup.cpp util/qundogroup.h
 )
 
-qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND NOT QT_FEATURE_opengles2
-    SOURCES
-        opengl/qopenglfunctions_1_0.cpp opengl/qopenglfunctions_1_0.h
-        opengl/qopenglfunctions_1_1.cpp opengl/qopenglfunctions_1_1.h
-        opengl/qopenglfunctions_1_2.cpp opengl/qopenglfunctions_1_2.h
-        opengl/qopenglfunctions_1_3.cpp opengl/qopenglfunctions_1_3.h
-        opengl/qopenglfunctions_1_4.cpp opengl/qopenglfunctions_1_4.h
-        opengl/qopenglfunctions_1_5.cpp opengl/qopenglfunctions_1_5.h
-        opengl/qopenglfunctions_2_0.cpp opengl/qopenglfunctions_2_0.h
-        opengl/qopenglfunctions_2_1.cpp opengl/qopenglfunctions_2_1.h
-        opengl/qopenglfunctions_3_0.cpp opengl/qopenglfunctions_3_0.h
-        opengl/qopenglfunctions_3_1.cpp opengl/qopenglfunctions_3_1.h
-        opengl/qopenglfunctions_3_2_compatibility.cpp opengl/qopenglfunctions_3_2_compatibility.h
-        opengl/qopenglfunctions_3_2_core.cpp opengl/qopenglfunctions_3_2_core.h
-        opengl/qopenglfunctions_3_3_compatibility.cpp opengl/qopenglfunctions_3_3_compatibility.h
-        opengl/qopenglfunctions_3_3_core.cpp opengl/qopenglfunctions_3_3_core.h
-        opengl/qopenglfunctions_4_0_compatibility.cpp opengl/qopenglfunctions_4_0_compatibility.h
-        opengl/qopenglfunctions_4_0_core.cpp opengl/qopenglfunctions_4_0_core.h
-        opengl/qopenglfunctions_4_1_compatibility.cpp opengl/qopenglfunctions_4_1_compatibility.h
-        opengl/qopenglfunctions_4_1_core.cpp opengl/qopenglfunctions_4_1_core.h
-        opengl/qopenglfunctions_4_2_compatibility.cpp opengl/qopenglfunctions_4_2_compatibility.h
-        opengl/qopenglfunctions_4_2_core.cpp opengl/qopenglfunctions_4_2_core.h
-        opengl/qopenglfunctions_4_3_compatibility.cpp opengl/qopenglfunctions_4_3_compatibility.h
-        opengl/qopenglfunctions_4_3_core.cpp opengl/qopenglfunctions_4_3_core.h
-        opengl/qopenglfunctions_4_4_compatibility.cpp opengl/qopenglfunctions_4_4_compatibility.h
-        opengl/qopenglfunctions_4_4_core.cpp opengl/qopenglfunctions_4_4_core.h
-        opengl/qopenglfunctions_4_5_compatibility.cpp opengl/qopenglfunctions_4_5_compatibility.h
-        opengl/qopenglfunctions_4_5_core.cpp opengl/qopenglfunctions_4_5_core.h
-)
-
-qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_opengles2
-    SOURCES
-        opengl/qopenglfunctions_es2.cpp opengl/qopenglfunctions_es2.h
-)
-
 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
     SOURCES
         rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@@ -616,7 +578,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
         Vulkan::Vulkan_nolink
 )
 
-#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 82:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
 # QMAKE_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
 # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
 # QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL"
@@ -632,10 +594,10 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"
 
-#### Keys ignored in scope 85:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 83:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"
 
-#### Keys ignored in scope 86:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 84:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"
 
 qt_extend_target(Gui CONDITION WASM