Remove unused internal rhi backingstore parameters

There is no user for these at this point: QOpenGLWidget does not
need any of these by nature, whereas QQuickWidget is also currently
in the works-as-is category, it has no need to communicate the need
for additional Vulkan device extensions for example.

Pick-to: 6.4
Task-number: QTBUG-108277
Change-Id: Idc09552027377a21a0e904fbb9bfbd95c3d0e0a1
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

2 files changed, 1 insertions, 17 deletions

diff --git a/src/gui/painting/qbackingstorerhisupport.cpp b/src/gui/painting/qbackingstorerhisupport.cpp
index f55fbc5a15..220ca59bca 100644
--- a/src/gui/painting/qbackingstorerhisupport.cpp
+++ b/src/gui/painting/qbackingstorerhisupport.cpp
@@ -116,7 +116,6 @@ bool QBackingStoreRhiSupport::create()
             return false;
         }
         params.window = m_window;
-        params.deviceExtensions = m_config.deviceExtensions();
         rhi = QRhi::create(QRhi::Vulkan, &params, flags);
     }
 #endif
diff --git a/src/gui/painting/qplatformbackingstore.h b/src/gui/painting/qplatformbackingstore.h
index 85bb0fe936..c6b66e57ef 100644
--- a/src/gui/painting/qplatformbackingstore.h
+++ b/src/gui/painting/qplatformbackingstore.h
@@ -66,22 +66,10 @@ struct Q_GUI_EXPORT QPlatformBackingStoreRhiConfig
     bool isDebugLayerEnabled() const { return m_debugLayer; }
     void setDebugLayer(bool enable) { m_debugLayer = enable; }
 
-    QByteArrayList instanceExtensions() const { return m_instanceExtensions; }
-    void setInstanceExtensions(const QByteArrayList &e) { m_instanceExtensions = e; }
-
-    QByteArrayList instanceLayers() const { return m_instanceLayers; }
-    void setInstanceLayers(const QByteArrayList &e) { m_instanceLayers = e; }
-
-    QByteArrayList deviceExtensions() const { return m_deviceExtensions; }
-    void setDeviceExtensions(const QByteArrayList &e) { m_deviceExtensions = e; }
-
 private:
     bool m_enable;
     Api m_api = Null;
     bool m_debugLayer = false;
-    QByteArrayList m_instanceExtensions;
-    QByteArrayList m_instanceLayers;
-    QByteArrayList m_deviceExtensions;
     friend bool operator==(const QPlatformBackingStoreRhiConfig &a, const QPlatformBackingStoreRhiConfig &b);
 };
 
@@ -89,10 +77,7 @@ inline bool operator==(const QPlatformBackingStoreRhiConfig &a, const QPlatformB
 {
     return a.m_enable == b.m_enable
             && a.m_api == b.m_api
-            && a.m_debugLayer == b.m_debugLayer
-            && a.m_instanceExtensions == b.m_instanceExtensions
-            && a.m_instanceLayers == b.m_instanceLayers
-            && a.m_deviceExtensions == b.m_deviceExtensions;
+            && a.m_debugLayer == b.m_debugLayer;
 }
 
 inline bool operator!=(const QPlatformBackingStoreRhiConfig &a, const QPlatformBackingStoreRhiConfig &b)