From 3916c57718239793d0e5cad67f04bc9155b58408 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Wed, 9 Nov 2022 11:47:11 +0100 Subject: 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 Reviewed-by: Andy Nichols --- src/gui/painting/qbackingstorerhisupport.cpp | 1 - src/gui/painting/qplatformbackingstore.h | 17 +---------------- 2 files changed, 1 insertion(+), 17 deletions(-) (limited to 'src/gui/painting') 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, ¶ms, 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) -- cgit v1.2.3