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

Remove unused internal rhi backingstore parameters

Browse Source 
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.

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>
(cherry picked from commit 3916c57718239793d0e5cad67f04bc9155b58408)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Laszlo Agocs 2022-11-09 11:47:11 +01:00 committed by Qt Cherry-pick Bot
parent bad9d473d3
commit 9aa0e21db9
2 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/painting/qbackingstorerhisupport.cpp
View File

@ -116,7 +116,6 @@ bool QBackingStoreRhiSupport::create()
return false; return false;
} }
params.window = m_window; params.window = m_window;
params.deviceExtensions = m_config.deviceExtensions();
rhi = QRhi::create(QRhi::Vulkan, &params, flags); rhi = QRhi::create(QRhi::Vulkan, &params, flags);
} }
#endif #endif

17
src/gui/painting/qplatformbackingstore.h
View File

@ -66,22 +66,10 @@ struct Q_GUI_EXPORT QPlatformBackingStoreRhiConfig
bool isDebugLayerEnabled() const { return m_debugLayer; } bool isDebugLayerEnabled() const { return m_debugLayer; }
void setDebugLayer(bool enable) { m_debugLayer = enable; } 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: private:
bool m_enable; bool m_enable;
Api m_api = Null; Api m_api = Null;
bool m_debugLayer = false; bool m_debugLayer = false;
QByteArrayList m_instanceExtensions;
QByteArrayList m_instanceLayers;
QByteArrayList m_deviceExtensions;
friend bool operator==(const QPlatformBackingStoreRhiConfig &a, const QPlatformBackingStoreRhiConfig &b); 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 return a.m_enable == b.m_enable
&& a.m_api == b.m_api && a.m_api == b.m_api
&& a.m_debugLayer == b.m_debugLayer && a.m_debugLayer == b.m_debugLayer;
&& a.m_instanceExtensions == b.m_instanceExtensions
&& a.m_instanceLayers == b.m_instanceLayers
&& a.m_deviceExtensions == b.m_deviceExtensions;
} }
inline bool operator!=(const QPlatformBackingStoreRhiConfig &a, const QPlatformBackingStoreRhiConfig &b) inline bool operator!=(const QPlatformBackingStoreRhiConfig &a, const QPlatformBackingStoreRhiConfig &b)