Adapt to the RHI API concept

Task-number: QTBUG-113331
Change-Id: If874d14ee83db862f58445fdad2822dcf4cb7fc5
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>

12 files changed, 14 insertions, 27 deletions

diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
index 53d36922c..1ce16a6c6 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
+++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext.cpp
@@ -41,23 +41,9 @@
 #include <private/qdebug_p.h>
 #include <QSurface>
 #include <QWindow>
-#include <QtShaderTools/private/qshaderbaker_p.h>
+#include <rhi/qrhi.h>
+#include <rhi/qshaderbaker.h>
 
-#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
-
-#ifndef QT_NO_OPENGL
-#include <QtGui/private/qrhigles2_p.h>
-#endif
-
-#if QT_CONFIG(vulkan)
-#include <QtGui/private/qrhivulkan_p.h>
-#endif
 #include <bitset>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h
index 350ed00b6..9b65550e5 100644
--- a/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h
+++ b/src/plugins/renderers/rhi/graphicshelpers/submissioncontext_p.h
@@ -27,8 +27,8 @@
 #include <shadervariables_p.h>
 #include <rhihandle_types_p.h>
 #include <QSurface>
-#include <QtGui/private/qrhi_p.h>
 #include <QOffscreenSurface>
+#include <rhi/qrhi.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/renderers/rhi/io/rhibuffer.cpp b/src/plugins/renderers/rhi/io/rhibuffer.cpp
index 868c49cfe..9607e8c32 100644
--- a/src/plugins/renderers/rhi/io/rhibuffer.cpp
+++ b/src/plugins/renderers/rhi/io/rhibuffer.cpp
@@ -3,7 +3,8 @@
 
 #include "rhibuffer_p.h"
 #include <submissioncontext_p.h>
-#include <QtGui/private/qrhi_p.h>
+#include <rhi/qrhi.h>
+
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
diff --git a/src/plugins/renderers/rhi/renderer/pipelineuboset.cpp b/src/plugins/renderers/rhi/renderer/pipelineuboset.cpp
index b973d4270..b9c09125d 100644
--- a/src/plugins/renderers/rhi/renderer/pipelineuboset.cpp
+++ b/src/plugins/renderers/rhi/renderer/pipelineuboset.cpp
@@ -10,7 +10,7 @@
 #include <rhigraphicspipeline_p.h>
 #include <rhiresourcemanagers_p.h>
 #include <submissioncontext_p.h>
-#include <QtGui/private/qrhi_p.h>
+#include <rhi/qrhi.h>
 #include <Qt3DRender/private/nodemanagers_p.h>
 #include <Qt3DRender/private/buffermanager_p.h>
 #include <Qt3DRender/private/stringtoint_p.h>
diff --git a/src/plugins/renderers/rhi/renderer/pipelineuboset_p.h b/src/plugins/renderers/rhi/renderer/pipelineuboset_p.h
index aa4ed00d2..55c3bbb60 100644
--- a/src/plugins/renderers/rhi/renderer/pipelineuboset_p.h
+++ b/src/plugins/renderers/rhi/renderer/pipelineuboset_p.h
@@ -16,7 +16,7 @@
 //
 
 #include <rhihandle_types_p.h>
-#include <private/qrhi_p.h>
+#include <rhi/qrhi.h>
 #include <shadervariables_p.h>
 #include <rhishader_p.h>
 
diff --git a/src/plugins/renderers/rhi/renderer/rendercommand_p.h b/src/plugins/renderers/rhi/renderer/rendercommand_p.h
index dc5d97f93..860b1f0d4 100644
--- a/src/plugins/renderers/rhi/renderer/rendercommand_p.h
+++ b/src/plugins/renderers/rhi/renderer/rendercommand_p.h
@@ -26,7 +26,7 @@
 #include <QOpenGLShaderProgram>
 #include <QOpenGLTexture>
 #include <QMatrix4x4>
-#include <QtGui/private/qrhi_p.h>
+#include <rhi/qrhi.h>
 #include <Qt3DCore/qattribute.h>
 #include <variant>
 
diff --git a/src/plugins/renderers/rhi/renderer/renderer_p.h b/src/plugins/renderers/rhi/renderer/renderer_p.h
index 463aec7d3..6f4590ef5 100644
--- a/src/plugins/renderers/rhi/renderer/renderer_p.h
+++ b/src/plugins/renderers/rhi/renderer/renderer_p.h
@@ -37,7 +37,7 @@
 #include <Qt3DRender/private/renderercache_p.h>
 #include <Qt3DRender/private/renderviewinitializerjob_p.h>
 
-#include <QtGui/private/qrhi_p.h>
+#include <rhi/qrhi.h>
 
 #include <shaderparameterpack_p.h>
 #include <logging_p.h>
diff --git a/src/plugins/renderers/rhi/renderer/rhigraphicspipeline_p.h b/src/plugins/renderers/rhi/renderer/rhigraphicspipeline_p.h
index 3f6c0c672..020d4583a 100644
--- a/src/plugins/renderers/rhi/renderer/rhigraphicspipeline_p.h
+++ b/src/plugins/renderers/rhi/renderer/rhigraphicspipeline_p.h
@@ -15,7 +15,7 @@
 // We mean it.
 //
 
-#include <private/qrhi_p.h>
+#include <rhi/qrhi.h>
 #include <rhihandle_types_p.h>
 #include <pipelineuboset_p.h>
 #include <Qt3DCore/qnodeid.h>
diff --git a/src/plugins/renderers/rhi/renderer/rhirendertarget_p.h b/src/plugins/renderers/rhi/renderer/rhirendertarget_p.h
index bfb57568d..0c958b315 100644
--- a/src/plugins/renderers/rhi/renderer/rhirendertarget_p.h
+++ b/src/plugins/renderers/rhi/renderer/rhirendertarget_p.h
@@ -15,7 +15,7 @@
 // We mean it.
 //
 
-#include <private/qrhi_p.h>
+#include <rhi/qrhi.h>
 #include <rhihandle_types_p.h>
 #include <private/attachmentpack_p.h>
 
diff --git a/src/plugins/renderers/rhi/renderer/rhishader_p.h b/src/plugins/renderers/rhi/renderer/rhishader_p.h
index ec46a39f8..b33c3b9ea 100644
--- a/src/plugins/renderers/rhi/renderer/rhishader_p.h
+++ b/src/plugins/renderers/rhi/renderer/rhishader_p.h
@@ -20,7 +20,7 @@
 #include <Qt3DRender/qshaderprogram.h>
 #include <QMutex>
 #include <QtGui/private/qshader_p.h>
-#include <QtGui/private/qrhi_p.h>
+#include <rhi/qrhi.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/plugins/renderers/rhi/textures/texture.cpp b/src/plugins/renderers/rhi/textures/texture.cpp
index c216cefdc..0f789ecd3 100644
--- a/src/plugins/renderers/rhi/textures/texture.cpp
+++ b/src/plugins/renderers/rhi/textures/texture.cpp
@@ -5,7 +5,7 @@
 #include "texture_p.h"
 
 #include <private/qdebug_p.h>
-#include <private/qrhi_p.h>
+#include <rhi/qrhi.h>
 #include <QDebug>
 #include <Qt3DCore/private/vector_helper_p.h>
 #include <Qt3DRender/qtexture.h>
diff --git a/src/quick3d/imports/scene3d/scene3drenderer.cpp b/src/quick3d/imports/scene3d/scene3drenderer.cpp
index d9b292cc2..eefe81919 100644
--- a/src/quick3d/imports/scene3d/scene3drenderer.cpp
+++ b/src/quick3d/imports/scene3d/scene3drenderer.cpp
@@ -9,7 +9,7 @@
 #include <qopenglcontext.h>
 #include <qopenglframebufferobject.h>
 #include <QtQuick/qquickwindow.h>
-#include <private/qrhi_p.h>
+#include <rhi/qrhi.h>
 
 #include <Qt3DRender/private/qrenderaspect_p.h>
 #include <Qt3DRender/private/abstractrenderer_p.h>