From 73f3f501f331444b3f188b21db7265f723e4f383 Mon Sep 17 00:00:00 2001 From: Johan Klokkhammer Helsing Date: Wed, 22 Jan 2020 17:01:30 +0100 Subject: Move versioned OpenGL functions from QtGui to QtOpenGL MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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(); Which now becomes QOpenGLVersionFunctionsFactory::get(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 Reviewed-by: Laszlo Agocs --- src/gui/opengl/opengl.pri | 69 ----------------------------------------------- 1 file changed, 69 deletions(-) (limited to 'src/gui/opengl/opengl.pri') diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index 2ca3809b4b..85fdb609cd 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -4,83 +4,14 @@ qtConfig(opengl): CONFIG += opengl qtConfig(opengles2): CONFIG += opengles2 qtConfig(opengl) { - HEADERS += opengl/qopengl.h \ opengl/qopengl_p.h \ opengl/qopenglfunctions.h \ opengl/qopenglextensions_p.h \ - opengl/qopenglversionfunctions.h \ - opengl/qopenglversionfunctionsfactory_p.h \ - opengl/qopenglversionprofile.h \ opengl/qopenglextrafunctions.h \ opengl/qopenglprogrambinarycache_p.h SOURCES += opengl/qopengl.cpp \ opengl/qopenglfunctions.cpp \ - opengl/qopenglversionfunctions.cpp \ - opengl/qopenglversionfunctionsfactory.cpp \ - opengl/qopenglversionprofile.cpp \ opengl/qopenglprogrambinarycache.cpp - - !qtConfig(opengles2) { - HEADERS += opengl/qopenglfunctions_1_0.h \ - opengl/qopenglfunctions_1_1.h \ - opengl/qopenglfunctions_1_2.h \ - opengl/qopenglfunctions_1_3.h \ - opengl/qopenglfunctions_1_4.h \ - opengl/qopenglfunctions_1_5.h \ - opengl/qopenglfunctions_2_0.h \ - opengl/qopenglfunctions_2_1.h \ - opengl/qopenglfunctions_3_0.h \ - opengl/qopenglfunctions_3_1.h \ - opengl/qopenglfunctions_3_2_core.h \ - opengl/qopenglfunctions_3_3_core.h \ - opengl/qopenglfunctions_4_0_core.h \ - opengl/qopenglfunctions_4_1_core.h \ - opengl/qopenglfunctions_4_2_core.h \ - opengl/qopenglfunctions_4_3_core.h \ - opengl/qopenglfunctions_4_4_core.h \ - opengl/qopenglfunctions_4_5_core.h \ - opengl/qopenglfunctions_3_2_compatibility.h \ - opengl/qopenglfunctions_3_3_compatibility.h \ - opengl/qopenglfunctions_4_0_compatibility.h \ - opengl/qopenglfunctions_4_1_compatibility.h \ - opengl/qopenglfunctions_4_2_compatibility.h \ - opengl/qopenglfunctions_4_3_compatibility.h \ - opengl/qopenglfunctions_4_4_compatibility.h \ - opengl/qopenglfunctions_4_5_compatibility.h - - SOURCES += opengl/qopenglfunctions_1_0.cpp \ - opengl/qopenglfunctions_1_1.cpp \ - opengl/qopenglfunctions_1_2.cpp \ - opengl/qopenglfunctions_1_3.cpp \ - opengl/qopenglfunctions_1_4.cpp \ - opengl/qopenglfunctions_1_5.cpp \ - opengl/qopenglfunctions_2_0.cpp \ - opengl/qopenglfunctions_2_1.cpp \ - opengl/qopenglfunctions_3_0.cpp \ - opengl/qopenglfunctions_3_1.cpp \ - opengl/qopenglfunctions_3_2_core.cpp \ - opengl/qopenglfunctions_3_3_core.cpp \ - opengl/qopenglfunctions_4_0_core.cpp \ - opengl/qopenglfunctions_4_1_core.cpp \ - opengl/qopenglfunctions_4_2_core.cpp \ - opengl/qopenglfunctions_4_3_core.cpp \ - opengl/qopenglfunctions_4_4_core.cpp \ - opengl/qopenglfunctions_4_5_core.cpp \ - opengl/qopenglfunctions_3_2_compatibility.cpp \ - opengl/qopenglfunctions_3_3_compatibility.cpp \ - opengl/qopenglfunctions_4_0_compatibility.cpp \ - opengl/qopenglfunctions_4_1_compatibility.cpp \ - opengl/qopenglfunctions_4_2_compatibility.cpp \ - opengl/qopenglfunctions_4_3_compatibility.cpp \ - opengl/qopenglfunctions_4_4_compatibility.cpp \ - opengl/qopenglfunctions_4_5_compatibility.cpp - } - - qtConfig(opengles2) { - HEADERS += opengl/qopenglfunctions_es2.h - - SOURCES += opengl/qopenglfunctions_es2.cpp - } } -- cgit v1.2.3