1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move glxconvenience into QtGui

Browse Source 
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>
This commit is contained in:
Friedemann Kleint 2020-07-09 15:48:19 +02:00
parent 60d72b7ab6
commit 6758f73bb7
19 changed files with 48 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/gui/.prev_CMakeLists.txt
View File

@ -680,6 +680,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
util/qundogroup.cpp util/qundogroup.h 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 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
SOURCES SOURCES
rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@ -693,7 +700,7 @@ qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
Vulkan::Vulkan_nolink 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_EXTRA_COMPILERS = "qvkgen_h" "qvkgen_ph" "qvkgen_pimpl"
# QMAKE_QVKGEN_INPUT = "vulkan/vk.xml" # QMAKE_QVKGEN_INPUT = "vulkan/vk.xml"
# QMAKE_QVKGEN_LICENSE_HEADER = "$$QT_SOURCE_TREE/header.LGPL" # 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.input = "QMAKE_QVKGEN_INPUT"
# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" # 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" # 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" # qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM qt_extend_target(Gui CONDITION WASM

11
src/gui/CMakeLists.txt
View File

@ -786,6 +786,13 @@ qt_extend_target(Gui CONDITION QT_FEATURE_undogroup
util/qundogroup.cpp util/qundogroup.h 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 qt_extend_target(Gui CONDITION QT_FEATURE_vulkan
SOURCES SOURCES
rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h rhi/qrhivulkan.cpp rhi/qrhivulkan_p.h
@ -855,10 +862,10 @@ add_custom_command(
# qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT" # qvkgen_pimpl.input = "QMAKE_QVKGEN_INPUT"
# qvkgen_pimpl.output = "$$OUT_PWD/vulkan/qvulkanfunctions_p.cpp" # 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" # 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" # qvkgen_h.CONFIG = "target_predeps" "no_link"
qt_extend_target(Gui CONDITION WASM qt_extend_target(Gui CONDITION WASM

2
src/gui/opengl/opengl.pri
View File

@ -15,3 +15,5 @@ qtConfig(opengl) {
opengl/qopenglfunctions.cpp \ opengl/qopenglfunctions.cpp \
opengl/qopenglprogrambinarycache.cpp opengl/qopenglprogrambinarycache.cpp
} }
include(platform/platform.pri)

0
src/opengl/platform/platform.pri → src/gui/opengl/platform/platform.pri
View File

0
src/opengl/platform/unix/qglxconvenience.cpp → src/gui/opengl/platform/unix/qglxconvenience.cpp
View File

35
src/opengl/platform/unix/qglxconvenience_p.h → src/gui/opengl/platform/unix/qglxconvenience_p.h
View File

@ -51,7 +51,6 @@
// We mean it. // We mean it.
// //
#include <QtOpenGL/qtopenglglobal.h>
#include <QtCore/qlist.h> #include <QtCore/qlist.h>
#include <QtGui/qsurfaceformat.h> #include <QtGui/qsurfaceformat.h>
@ -65,28 +64,28 @@ enum QGlxFlags
QGLX_SUPPORTS_SRGB = 0x01 QGLX_SUPPORTS_SRGB = 0x01
}; };
Q_OPENGL_EXPORT QList<int> qglx_buildSpec(const QSurfaceFormat &format, Q_GUI_EXPORT QList<int> qglx_buildSpec(const QSurfaceFormat &format,
int drawableBit = GLX_WINDOW_BIT, int drawableBit = GLX_WINDOW_BIT,
int flags = 0); int flags = 0);
Q_OPENGL_EXPORT XVisualInfo *qglx_findVisualInfo(Display *display, int screen, Q_GUI_EXPORT XVisualInfo *qglx_findVisualInfo(Display *display, int screen,
QSurfaceFormat *format, QSurfaceFormat *format,
int drawableBit = GLX_WINDOW_BIT, int drawableBit = GLX_WINDOW_BIT,
int flags = 0); int flags = 0);
Q_OPENGL_EXPORT GLXFBConfig qglx_findConfig(Display *display, int screen, Q_GUI_EXPORT GLXFBConfig qglx_findConfig(Display *display, int screen,
QSurfaceFormat format, QSurfaceFormat format,
bool highestPixelFormat = false, bool highestPixelFormat = false,
int drawableBit = GLX_WINDOW_BIT, int drawableBit = GLX_WINDOW_BIT,
int flags = 0); int flags = 0);
Q_OPENGL_EXPORT void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display, Q_GUI_EXPORT void qglx_surfaceFormatFromGLXFBConfig(QSurfaceFormat *format, Display *display,
GLXFBConfig config, int flags = 0); GLXFBConfig config, int flags = 0);
Q_OPENGL_EXPORT void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display, Q_GUI_EXPORT void qglx_surfaceFormatFromVisualInfo(QSurfaceFormat *format, Display *display,
XVisualInfo *visualInfo, int flags = 0); XVisualInfo *visualInfo, int flags = 0);
Q_OPENGL_EXPORT bool qglx_reduceFormat(QSurfaceFormat *format); Q_GUI_EXPORT bool qglx_reduceFormat(QSurfaceFormat *format);
QT_END_NAMESPACE QT_END_NAMESPACE

7
src/gui/opengl/platform/unix/unix.pri Normal file
View File

@ -0,0 +1,7 @@
HEADERS += \
opengl/platform/unix/qglxconvenience_p.h
SOURCES += \
opengl/platform/unix/qglxconvenience.cpp
QMAKE_USE += xlib

7
src/opengl/.prev_CMakeLists.txt
View File

@ -99,13 +99,6 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h 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_create_tracepoints(OpenGL qtopengl.tracepoints)
qt_add_docs(OpenGL qt_add_docs(OpenGL

7
src/opengl/CMakeLists.txt
View File

@ -99,13 +99,6 @@ qt_extend_target(OpenGL CONDITION QT_FEATURE_egl
qopenglcompositorbackingstore.cpp qopenglcompositorbackingstore_p.h 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_create_tracepoints(OpenGL qtopengl.tracepoints)
qt_add_docs(OpenGL qt_add_docs(OpenGL
doc/qtopengl.qdocconf doc/qtopengl.qdocconf

2
src/opengl/opengl.pro
View File

@ -151,8 +151,6 @@ qtConfig(egl) {
qopenglcompositor_p.h qopenglcompositor_p.h
} }
include(platform/platform.pri)
load(qt_module) load(qt_module)
TRACEPOINT_PROVIDER = $$PWD/qtopengl.tracepoints TRACEPOINT_PROVIDER = $$PWD/qtopengl.tracepoints

9
src/opengl/platform/unix/unix.pri
View File

@ -1,9 +0,0 @@
QMAKE_USE += xlib
HEADERS += \
platform/unix/qglxconvenience_p.h
SOURCES += \
platform/unix/qglxconvenience.cpp
QMAKE_USE += xlib

2
src/plugins/platforms/offscreen/.prev_CMakeLists.txt
View File

@ -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 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
SOURCES SOURCES
qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h 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: #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:

2
src/plugins/platforms/offscreen/CMakeLists.txt
View File

@ -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 qt_extend_target(QOffscreenIntegrationPlugin CONDITION QT_FEATURE_opengl AND QT_FEATURE_xlib AND NOT QT_FEATURE_opengles2
SOURCES SOURCES
qoffscreenintegration_x11.cpp qoffscreenintegration_x11.h 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: #### Keys ignored in scope 3:.:.:offscreen.pro:NOT TARGET___equals____ss_QT_DEFAULT_QPA_PLUGIN:

1
src/plugins/platforms/offscreen/offscreen.pro
View File

@ -19,7 +19,6 @@ OTHER_FILES += offscreen.json
qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) { qtConfig(xlib):qtConfig(opengl):!qtConfig(opengles2) {
SOURCES += qoffscreenintegration_x11.cpp SOURCES += qoffscreenintegration_x11.cpp
HEADERS += qoffscreenintegration_x11.h HEADERS += qoffscreenintegration_x11.h
QT += opengl-private
} }
PLUGIN_TYPE = platforms PLUGIN_TYPE = platforms

2
src/plugins/platforms/offscreen/qoffscreenintegration_x11.cpp
View File

@ -45,7 +45,7 @@
#include <X11/Xlib.h> #include <X11/Xlib.h>
#include <GL/glx.h> #include <GL/glx.h>
#include <QtOpenGL/private/qglxconvenience_p.h> #include <QtGui/private/qglxconvenience_p.h>
#include <qpa/qplatformsurface.h> #include <qpa/qplatformsurface.h>
#include <qsurface.h> #include <qsurface.h>

1
src/plugins/platforms/xcb/gl_integrations/xcb_glx/CMakeLists.txt
View File

@ -23,7 +23,6 @@ qt_internal_add_plugin(QXcbGlxIntegrationPlugin
Qt::CorePrivate Qt::CorePrivate
Qt::Gui Qt::Gui
Qt::GuiPrivate Qt::GuiPrivate
Qt::OpenGLPrivate
Qt::XcbQpaPrivate Qt::XcbQpaPrivate
) )

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qglxintegration.cpp
View File

@ -55,7 +55,7 @@
#include <QtGui/QOffscreenSurface> #include <QtGui/QOffscreenSurface>
#include "qglxintegration.h" #include "qglxintegration.h"
#include <QtOpenGL/private/qglxconvenience_p.h> #include <QtGui/private/qglxconvenience_p.h>
#include "qxcbglintegration.h" #include "qxcbglintegration.h"

2
src/plugins/platforms/xcb/gl_integrations/xcb_glx/qxcbglxwindow.cpp
View File

@ -40,7 +40,7 @@
#include "qxcbglxwindow.h" #include "qxcbglxwindow.h"
#include "qxcbscreen.h" #include "qxcbscreen.h"
#include <QtOpenGL/private/qglxconvenience_p.h> #include <QtGui/private/qglxconvenience_p.h>
#include <QDebug> #include <QDebug>
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE

1
src/plugins/platforms/xcb/gl_integrations/xcb_glx/xcb_glx.pro
View File

@ -1,7 +1,6 @@
TARGET = qxcb-glx-integration TARGET = qxcb-glx-integration
include(../gl_integrations_plugin_base.pri) include(../gl_integrations_plugin_base.pri)
QT += opengl-private
DEFINES += QT_NO_FOREACH DEFINES += QT_NO_FOREACH