diff options
author | Laszlo Agocs <laszlo.agocs@qt.io> | 2023-04-28 12:43:28 +0200 |
---|---|---|
committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2023-05-22 21:15:40 +0200 |
commit | 3e781ec9b9d46ca444ef711d0a4ffecbd6c3b225 (patch) | |
tree | b12269b313fd013e702b2eecac03e05a86f9bea7 /src | |
parent | da90f218005e9f2acae2bf8cce721b01c1a98598 (diff) |
Adapt to the RHI API concept
Task-number: QTBUG-113331
Change-Id: I992f3cbc9e4ceff6e62452bf354e5c46dd8fa84b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'src')
29 files changed, 32 insertions, 72 deletions
diff --git a/src/multimedia/video/qabstractvideobuffer.cpp b/src/multimedia/video/qabstractvideobuffer.cpp index ab66ec909..d65438855 100644 --- a/src/multimedia/video/qabstractvideobuffer.cpp +++ b/src/multimedia/video/qabstractvideobuffer.cpp @@ -4,7 +4,7 @@ #include "qabstractvideobuffer_p.h" #include <qvariant.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QDebug> diff --git a/src/multimedia/video/qvideoframe.cpp b/src/multimedia/video/qvideoframe.cpp index e0f45cecd..503a29f70 100644 --- a/src/multimedia/video/qvideoframe.cpp +++ b/src/multimedia/video/qvideoframe.cpp @@ -15,7 +15,7 @@ #include <qpair.h> #include <qsize.h> #include <qvariant.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QDebug> diff --git a/src/multimedia/video/qvideoframeconverter.cpp b/src/multimedia/video/qvideoframeconverter.cpp index 0d0bf3179..67ffc2542 100644 --- a/src/multimedia/video/qvideoframeconverter.cpp +++ b/src/multimedia/video/qvideoframeconverter.cpp @@ -5,32 +5,18 @@ #include "qvideoframeconversionhelper_p.h" #include "qvideoframeformat.h" -#include <QtGui/private/qrhinull_p.h> -#if QT_CONFIG(opengl) -#include <QtGui/private/qrhigles2_p.h> -#include <QOffscreenSurface> -#endif -#if QT_CONFIG(vulkan) -#include <QtGui/private/qrhivulkan_p.h> -#endif -#ifdef Q_OS_WIN -#include <QtGui/private/qrhid3d11_p.h> -#endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif - #include <QtCore/qcoreapplication.h> #include <QtCore/qsize.h> #include <QtCore/qhash.h> #include <QtCore/qfile.h> #include <QtCore/qthreadstorage.h> #include <QtGui/qimage.h> +#include <QtGui/qoffscreensurface.h> #include <qpa/qplatformintegration.h> #include <private/qvideotexturehelper_p.h> #include <private/qabstractvideobuffer_p.h> #include <private/qguiapplication_p.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #ifdef Q_OS_DARWIN #include <QtCore/private/qcore_mac_p.h> diff --git a/src/multimedia/video/qvideosink.cpp b/src/multimedia/video/qvideosink.cpp index 83a70964a..4551a8960 100644 --- a/src/multimedia/video/qvideosink.cpp +++ b/src/multimedia/video/qvideosink.cpp @@ -97,7 +97,6 @@ QVideoSink::~QVideoSink() } /*! - \internal Returns the QRhi instance being used to create texture data in the video frames. */ QRhi *QVideoSink::rhi() const diff --git a/src/multimedia/video/qvideotexturehelper_p.h b/src/multimedia/video/qvideotexturehelper_p.h index d888ec9e4..982c1b48a 100644 --- a/src/multimedia/video/qvideotexturehelper_p.h +++ b/src/multimedia/video/qvideotexturehelper_p.h @@ -16,7 +16,7 @@ // #include <qvideoframeformat.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtGui/qtextlayout.h> diff --git a/src/multimedia/video/qvideowindow_p.h b/src/multimedia/video/qvideowindow_p.h index 77857c7c6..3305d3b40 100644 --- a/src/multimedia/video/qvideowindow_p.h +++ b/src/multimedia/video/qvideowindow_p.h @@ -16,23 +16,9 @@ // #include <QWindow> -#include <qtextlayout.h> - -#include <QtGui/private/qrhinull_p.h> -#if QT_CONFIG(opengl) -#include <QtGui/private/qrhigles2_p.h> #include <QOffscreenSurface> -#endif -#if QT_CONFIG(vulkan) -#include <QtGui/private/qrhivulkan_p.h> -#endif -#ifdef Q_OS_WIN -#include <QtGui/private/qrhid3d11_p.h> -#endif -#if defined(Q_OS_MACOS) || defined(Q_OS_IOS) -#include <QtGui/private/qrhimetal_p.h> -#endif - +#include <qtextlayout.h> +#include <rhi/qrhi.h> #include <qvideoframe.h> #include <private/qplatformvideosink_p.h> #include <private/qvideotexturehelper_p.h> diff --git a/src/multimediaquick/qsgvideotexture_p.h b/src/multimediaquick/qsgvideotexture_p.h index 5e2ec0af3..f9a7377b8 100644 --- a/src/multimediaquick/qsgvideotexture_p.h +++ b/src/multimediaquick/qsgvideotexture_p.h @@ -17,7 +17,7 @@ #include <QtQuick/QSGTexture> #include <QImage> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <private/qtmultimediaquickglobal_p.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp index 8ec0ec9d2..4afb119ee 100644 --- a/src/plugins/multimedia/android/common/qandroidvideooutput.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideooutput.cpp @@ -4,7 +4,7 @@ #include "qandroidvideooutput_p.h" #include "androidsurfacetexture_p.h" -#include <QtGui/private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <QtGui/private/qopenglextensions_p.h> #include <private/qabstractvideobuffer_p.h> #include <private/qvideoframeconverter_p.h> diff --git a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h index b9a3bc4d6..bf17ee62e 100644 --- a/src/plugins/multimedia/android/common/qandroidvideooutput_p.h +++ b/src/plugins/multimedia/android/common/qandroidvideooutput_p.h @@ -20,8 +20,8 @@ #include <qreadwritelock.h> #include <private/qabstractvideobuffer_p.h> #include <qmatrix4x4.h> -#include <QtGui/private/qrhi_p.h> -#include <QtGui/qoffscreensurface.h> +#include <qoffscreensurface.h> +#include <rhi/qrhi.h> QT_BEGIN_NAMESPACE diff --git a/src/plugins/multimedia/android/common/qandroidvideosink.cpp b/src/plugins/multimedia/android/common/qandroidvideosink.cpp index f5198fa0e..6315085b6 100644 --- a/src/plugins/multimedia/android/common/qandroidvideosink.cpp +++ b/src/plugins/multimedia/android/common/qandroidvideosink.cpp @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qandroidvideosink_p.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtCore/qdebug.h> diff --git a/src/plugins/multimedia/darwin/avfvideobuffer.mm b/src/plugins/multimedia/darwin/avfvideobuffer.mm index 6dab857cc..ca7533333 100644 --- a/src/plugins/multimedia/darwin/avfvideobuffer.mm +++ b/src/plugins/multimedia/darwin/avfvideobuffer.mm @@ -2,9 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "avfvideobuffer_p.h" -#include <private/qrhi_p.h> -#include <private/qrhimetal_p.h> -#include <private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <CoreVideo/CVMetalTexture.h> #include <CoreVideo/CVMetalTextureCache.h> #include <QtGui/qopenglcontext.h> diff --git a/src/plugins/multimedia/darwin/avfvideosink.mm b/src/plugins/multimedia/darwin/avfvideosink.mm index f25b4e7a2..b5ff7424a 100644 --- a/src/plugins/multimedia/darwin/avfvideosink.mm +++ b/src/plugins/multimedia/darwin/avfvideosink.mm @@ -3,9 +3,7 @@ #include "avfvideosink_p.h" -#include <private/qrhi_p.h> -#include <private/qrhimetal_p.h> -#include <private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <QtGui/qopenglcontext.h> #include <AVFoundation/AVFoundation.h> diff --git a/src/plugins/multimedia/darwin/camera/avfcamerarenderer.mm b/src/plugins/multimedia/darwin/camera/avfcamerarenderer.mm index 5ea320d81..5709e6cb3 100644 --- a/src/plugins/multimedia/darwin/camera/avfcamerarenderer.mm +++ b/src/plugins/multimedia/darwin/camera/avfcamerarenderer.mm @@ -12,7 +12,7 @@ #include "qvideosink.h" #include "qavfhelpers_p.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #import <AVFoundation/AVFoundation.h> diff --git a/src/plugins/multimedia/darwin/mediaplayer/avfvideorenderercontrol.mm b/src/plugins/multimedia/darwin/mediaplayer/avfvideorenderercontrol.mm index 0ebffa30c..986b9b235 100644 --- a/src/plugins/multimedia/darwin/mediaplayer/avfvideorenderercontrol.mm +++ b/src/plugins/multimedia/darwin/mediaplayer/avfvideorenderercontrol.mm @@ -9,7 +9,7 @@ #include <QtMultimedia/qvideoframeformat.h> #include <avfvideosink_p.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtCore/qdebug.h> diff --git a/src/plugins/multimedia/ffmpeg/qavfcamera.mm b/src/plugins/multimedia/ffmpeg/qavfcamera.mm index d62602609..0a22e81bd 100644 --- a/src/plugins/multimedia/ffmpeg/qavfcamera.mm +++ b/src/plugins/multimedia/ffmpeg/qavfcamera.mm @@ -9,7 +9,7 @@ #include "avfcameradebug_p.h" #include "qavfsamplebufferdelegate_p.h" #include <qvideosink.h> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qpermissions.h> #define AVMediaType XAVMediaType diff --git a/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm b/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm index cb35a442e..7f46d40fe 100644 --- a/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm +++ b/src/plugins/multimedia/ffmpeg/qavfscreencapture.mm @@ -6,7 +6,7 @@ #include <qscreencapture.h> #include <qscreen.h> #include <QGuiApplication> -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include "qavfsamplebufferdelegate_p.h" #include "qffmpegscreencapturethread_p.h" diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp index aa5e43fee..ee57cacb3 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel.cpp @@ -19,7 +19,7 @@ #include "qffmpeg_p.h" #include "qffmpegvideobuffer_p.h" -#include <private/qrhi_p.h> +#include <rhi/qrhi.h> #include <qloggingcategory.h> #include <set> diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp index 44cd4e0c8..d80023409 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_d3d11.cpp @@ -9,8 +9,7 @@ #include <private/qvideotexturehelper_p.h> #include <private/qcomptr_p.h> -#include <private/qrhi_p.h> -#include <private/qrhid3d11_p.h> +#include <rhi/qrhi.h> #include <qopenglfunctions.h> #include <qdebug.h> diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_mediacodec.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_mediacodec.cpp index 9f0de62d2..b1f9e8078 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_mediacodec.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_mediacodec.cpp @@ -4,7 +4,7 @@ #include "qffmpeghwaccel_mediacodec_p.h" #include "androidsurfacetexture_p.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> extern "C" { #include <libavcodec/mediacodec.h> diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_vaapi.cpp b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_vaapi.cpp index 697a2e8b9..a7df486a2 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_vaapi.cpp +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_vaapi.cpp @@ -13,8 +13,7 @@ #include "qffmpegvideobuffer_p.h" #include "private/qvideotexturehelper_p.h" -#include <private/qrhi_p.h> -#include <private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <qguiapplication.h> #include <qpa/qplatformnativeinterface.h> diff --git a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm index da4c4c256..65275932c 100644 --- a/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm +++ b/src/plugins/multimedia/ffmpeg/qffmpeghwaccel_videotoolbox.mm @@ -12,9 +12,7 @@ #include <qloggingcategory.h> #include "private/qvideotexturehelper_p.h" -#include <private/qrhi_p.h> -#include <private/qrhimetal_p.h> -#include <private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <CoreVideo/CVMetalTexture.h> #include <CoreVideo/CVMetalTextureCache.h> diff --git a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp index f49dd8278..52bbc8f0d 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstreamervideosink.cpp @@ -5,10 +5,9 @@ #include "qgstvideorenderersink_p.h" #include "qgstsubtitlesink_p.h" #include <qgstutils_p.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #if QT_CONFIG(gstreamer_gl) -#include <QtGui/private/qrhigles2_p.h> #include <QGuiApplication> #include <QtGui/qopenglcontext.h> #include <QWindow> diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideobuffer.cpp b/src/plugins/multimedia/gstreamer/common/qgstvideobuffer.cpp index 3c62fc405..135c1d141 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstvideobuffer.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstvideobuffer.cpp @@ -15,8 +15,7 @@ #include "qgstutils_p.h" #if QT_CONFIG(gstreamer_gl) -#include <QtGui/private/qrhi_p.h> -#include <QtGui/private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <QtGui/qopenglcontext.h> #include <QtGui/qopenglfunctions.h> #include <QtGui/qopengl.h> diff --git a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp index d67319fdd..03433cc43 100644 --- a/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp +++ b/src/plugins/multimedia/gstreamer/common/qgstvideorenderersink.cpp @@ -22,7 +22,7 @@ #include "qgstutils_p.h" -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #if QT_CONFIG(gstreamer_gl) #include <gst/gl/gl.h> #endif // #if QT_CONFIG(gstreamer_gl) diff --git a/src/plugins/multimedia/qnx/common/qqnxwindowgrabber.cpp b/src/plugins/multimedia/qnx/common/qqnxwindowgrabber.cpp index 333b4f613..28f16b70a 100644 --- a/src/plugins/multimedia/qnx/common/qqnxwindowgrabber.cpp +++ b/src/plugins/multimedia/qnx/common/qqnxwindowgrabber.cpp @@ -13,8 +13,7 @@ #include <QOpenGLContext> #include <QOpenGLFunctions> -#include <QtGui/private/qrhi_p.h> -#include <QtGui/private/qrhigles2_p.h> +#include <rhi/qrhi.h> #include <cstring> diff --git a/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink.cpp b/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink.cpp index 1f31b25ac..b6fe0e8e0 100644 --- a/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink.cpp +++ b/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink.cpp @@ -3,6 +3,8 @@ #include "qwasmvideosink_p.h" +#include <QtGui/rhi/qrhi.h> + QT_BEGIN_NAMESPACE QWasmVideoSink::QWasmVideoSink(QVideoSink *parent) diff --git a/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink_p.h b/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink_p.h index 841361722..5f2885249 100644 --- a/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink_p.h +++ b/src/plugins/multimedia/wasm/mediaplayer/qwasmvideosink_p.h @@ -17,11 +17,10 @@ #include <private/qplatformvideosink_p.h> -#include <QtGui/private/qrhigles2_p.h> - QT_BEGIN_NAMESPACE class QVideoSink; +class QRhi; class QWasmVideoSink : public QPlatformVideoSink { diff --git a/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp b/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp index bb6d0390f..e2f09ea57 100644 --- a/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp +++ b/src/plugins/multimedia/windows/evr/evrcustompresenter.cpp @@ -9,7 +9,7 @@ #include <private/qplatformvideosink_p.h> #include <private/qwindowsmfdefs_p.h> -#include <QtGui/private/qrhi_p.h> +#include <rhi/qrhi.h> #include <QtCore/qmutex.h> #include <QtCore/qvarlengtharray.h> diff --git a/src/plugins/multimedia/windows/evr/evrd3dpresentengine.cpp b/src/plugins/multimedia/windows/evr/evrd3dpresentengine.cpp index 7fab5b8cd..21cce53b7 100644 --- a/src/plugins/multimedia/windows/evr/evrd3dpresentengine.cpp +++ b/src/plugins/multimedia/windows/evr/evrd3dpresentengine.cpp @@ -14,8 +14,7 @@ #include <d3d11_1.h> -#include <private/qrhi_p.h> -#include <private/qrhid3d11_p.h> +#include <rhi/qrhi.h> #if QT_CONFIG(opengl) # include <qopenglcontext.h> |