Move glxconvenience into QtGui

OpenGL is not quite as dead as initially assumed. Task-number: QTBUG-83255 Change-Id: I953040149812a5258caad5fe6bac0835e1982dd0 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
2020-07-09 15:48:19 +02:00 · 2020-07-09 15:48:19 +02:00 · 6758f73bb7
commit 6758f73bb7
parent 60d72b7ab6
19 changed files with 48 additions and 58 deletions
--- a/src/gui/.prev_CMakeLists.txt
+++ b/src/gui/.prev_CMakeLists.txt
@ -680,6 +680,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
        util/qundogroup.cpp util/qundogroup.h
 )

+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+    SOURCES
+        opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
+    PUBLIC_LIBRARIES
+        X11::X11
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
    SOURCES
        rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@ -693,7 +700,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
        Vulkan::Vulkan_nolink
 )

-#### Keys ignored in scope 101:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vkgen:
+#### Keys ignored in scope 104:.: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"
@ -709,10 +716,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 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 105:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"

-#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 106:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"

 qt_extend_target(Gui CONDITION WASM
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@ -786,6 +786,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
        util/qundogroup.cpp util/qundogroup.h
 )

+qt_extend_target(Gui CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
+    SOURCES
+        opengl/platform/unix/qglxconvenience.cpp opengl/platform/unix/qglxconvenience_p.h
+    PUBLIC_LIBRARIES
+        X11::X11
+)
+
 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
    SOURCES
        rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@ -855,10 +862,10 @@ add_custom_command(
 # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
 # qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp"

-#### Keys ignored in scope 102:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
+#### Keys ignored in scope 105:.:vulkan:vulkan/vulkan.pri:QT_FEATURE_vulkan:
 # qvkgen_h.variable_out = "HEADERS"

-#### Keys ignored in scope 103:.:vulkan:vulkan/vulkan.pri:else:
+#### Keys ignored in scope 106:.:vulkan:vulkan/vulkan.pri:else:
 # qvkgen_h.CONFIG = "target_predeps" "no_link"

 qt_extend_target(Gui CONDITION WASM
--- a/src/gui/opengl/opengl.pri
+++ b/src/gui/opengl/opengl.pri
@ -15,3 +15,5 @@ qtConfig(opengl) {
               opengl/qopenglfunctions.cpp \
               opengl/qopenglprogrambinarycache.cpp
 }
+
+include(platform/platform.pri)
--- a/src/gui/opengl/platform/platform.pri
+++ b/src/gui/opengl/platform/platform.pri
--- a/src/gui/opengl/platform/unix/qglxconvenience.cpp
+++ b/src/gui/opengl/platform/unix/qglxconvenience.cpp
--- a/src/gui/opengl/platform/unix/qglxconvenience_p.h
+++ b/src/gui/opengl/platform/unix/qglxconvenience_p.h
@ -51,7 +51,6 @@
 // We mean it.
 //

-#include <QtOpenGL/qtopenglglobal.h>
 #include <QtCore/qlist.h>
 #include <QtGui/qsurfaceformat.h>

@ -65,28 +64,28 @@ enum QGlxFlags
    QGLX_SUPPORTS_SRGB = 0x01
 };

-Q_OPENGL_EXPORT QList<int> qglx_buildSpec(const QSurfaceFormat &format,
-                                          int drawableBit = GLX_WINDOW_BIT,
-                                          int flags = 0);
+Q_GUI_EXPORT QList<int> qglx_buildSpec(const QSurfaceFormat &format,
+                                       int drawableBit = GLX_WINDOW_BIT,
+                                       int flags = 0);

-Q_OPENGL_EXPORT XVisualInfo *qglx_findVisualInfo(Display *display, int screen,
-                                                 QSurfaceFormat *format,
-                                                 int drawableBit = GLX_WINDOW_BIT,
-                                                 int flags = 0);
+Q_GUI_EXPORT XVisualInfo *qglx_findVisualInfo(Display *display, int screen,
+                                              QSurfaceFormat *format,
+                                              int drawableBit = GLX_WINDOW_BIT,
+                                              int flags = 0);

-Q_OPENGL_EXPORT GLXFBConfig qglx_findConfig(Display *display, int screen,
-                                            QSurfaceFormat format,
-                                            bool highestPixelFormat = false,
-                                            int drawableBit = GLX_WINDOW_BIT,
-                                            int flags = 0);
+Q_GUI_EXPORT GLXFBConfig qglx_findConfig(Display *display, int screen,
+                                         QSurfaceFormat format,
+                                         bool highestPixelFormat = false,
+                                         int drawableBit = GLX_WINDOW_BIT,
+                                         int flags = 0);

-Q_OPENGL_EXPORT void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display,
-                                                       GLXFBConfig config, int flags = 0);
+Q_GUI_EXPORT void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display,
+                                                    GLXFBConfig config, int flags = 0);

-Q_OPENGL_EXPORT void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display,
-                                                      XVisualInfo *visualInfo, int flags = 0);
+Q_GUI_EXPORT void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display,
+                                                   XVisualInfo *visualInfo, int flags = 0);

-Q_OPENGL_EXPORT bool qglx_reduceFormat(QSurfaceFormat *format);
+Q_GUI_EXPORT bool qglx_reduceFormat(QSurfaceFormat *format);

 QT_END_NAMESPACE

--- a/src/gui/opengl/platform/unix/unix.pri
+++ b/src/gui/opengl/platform/unix/unix.pri
@ -0,0 +1,7 @@
+HEADERS += \
+   opengl/platform/unix/qglxconvenience_p.h
+
+SOURCES += \
+   opengl/platform/unix/qglxconvenience.cpp
+
+QMAKE_USE += xlib
--- a/src/opengl/.prev_CMakeLists.txt
+++ b/src/opengl/.prev_CMakeLists.txt
@ -99,13 +99,6 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
        qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )

-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
-    SOURCES
-        platform/unix/qglxconvenience.cpp platform/unix/qglxconvenience_p.h
-    PUBLIC_LIBRARIES
-        X11::X11
-)
-

 qt_create_tracepoints(OpenGL qtopengl.tracepoints)
 qt_add_docs(OpenGL
--- a/src/opengl/CMakeLists.txt
+++ b/src/opengl/CMakeLists.txt
@ -99,13 +99,6 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
        qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h
 )

-qt_extend_target(OpenGL CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
-    SOURCES
-        platform/unix/qglxconvenience.cpp platform/unix/qglxconvenience_p.h
-    PUBLIC_LIBRARIES
-        X11::X11
-)
-
 qt_create_tracepoints(OpenGL qtopengl.tracepoints)
 qt_add_docs(OpenGL
    doc/qtopengl.qdocconf
--- a/src/opengl/opengl.pro
+++ b/src/opengl/opengl.pro
@ -151,8 +151,6 @@ qtConfig(egl) {
        qopenglcompositor_p.h
 }

-include(platform/platform.pri)
-
 load(qt_module)

 TRACEPOINT_PROVIDER = $$PWD/qtopengl.tracepoints
--- a/src/opengl/platform/unix/unix.pri
+++ b/src/opengl/platform/unix/unix.pri
@ -1,9 +0,0 @@
-QMAKE_USE += xlib
-
-HEADERS += \
-   platform/unix/qglxconvenience_p.h
-
-SOURCES += \
-   platform/unix/qglxconvenience.cpp
-
-QMAKE_USE += xlib
--- a/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/.prev_CMakeLists.txt
@ -30,8 +30,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
    SOURCES
        qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
 )

 #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
--- a/src/plugins/platforms/offscreen/CMakeLists.txt
+++ b/src/plugins/platforms/offscreen/CMakeLists.txt
@ -31,8 +31,6 @@ qt_internal_add_plugin(QOffscreenIntegrationPlugin
 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
    SOURCES
        qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h
-    PUBLIC_LIBRARIES
-        Qt::OpenGLPrivate
 )

 #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:
--- a/src/plugins/platforms/offscreen/offscreen.pro
+++ b/src/plugins/platforms/offscreen/offscreen.pro
@ -19,7 +19,6 @@ OTHER_FILES += offscreen.json
 qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) {
    SOURCES += qoffscreenintegration_x11.cpp
    HEADERS += qoffscreenintegration_x11.h
-    QT += opengl-private
 }

 PLUGIN_TYPE = platforms
--- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
+++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
@ -45,7 +45,7 @@
 #include <X11/Xlib.h>
 #include <GL/glx.h>

-#include <QtOpenGL/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>

 #include <qpa/qplatformsurface.h>
 #include <qsurface.h>
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
@ -23,7 +23,6 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
        Qt::CorePrivate
        Qt::Gui
        Qt::GuiPrivate
-        Qt::OpenGLPrivate
        Qt::XcbQpaPrivate
 )

--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
@ -55,7 +55,7 @@
 #include <QtGui/QOffscreenSurface>

 #include "qglxintegration.h"
-#include <QtOpenGL/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>

 #include "qxcbglintegration.h"

--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp
@ -40,7 +40,7 @@
 #include "qxcbglxwindow.h"

 #include "qxcbscreen.h"
-#include <QtOpenGL/private/qglxconvenience_p.h>
+#include <QtGui/private/qglxconvenience_p.h>
 #include <QDebug>

 QT_BEGIN_NAMESPACE
--- a/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
+++ b/src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
@ -1,7 +1,6 @@
 TARGET = qxcb-glx-integration

 include(../gl_integrations_plugin_base.pri)
-QT += opengl-private

 DEFINES += QT_NO_FOREACH