From 459be7030ef1524160d60a3712e7161ecc55896e Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 16 Nov 2023 12:52:53 +0100 Subject: [PATCH] rhi: Add the more appropriate srb class name as an alias We will not have time to roll out the proper name change in 6.7, even though we are not bound by compatibility promises. In the absence of a holistic migration that covers all Qt modules, just add the new name with using. The proper solution would be the reverse: the name changes everywhere and the old class name becomes available via using; but for now we can live with the reverse, which still allows new code (such as new examples, and future application code) use the more descriptive name. Change-Id: I18e791f4f93cb9b4fae8ec21aeb99b4bf93662f1 Reviewed-by: Andy Nichols --- src/gui/rhi/qrhi.cpp | 8 ++++++++ src/gui/rhi/qrhi.h | 5 +++++ 2 files changed, 13 insertions(+) diff --git a/src/gui/rhi/qrhi.cpp b/src/gui/rhi/qrhi.cpp index 0be717500d..415297b29b 100644 --- a/src/gui/rhi/qrhi.cpp +++ b/src/gui/rhi/qrhi.cpp @@ -5085,6 +5085,14 @@ QRhiResource::Type QRhiTextureRenderTarget::resourceType() const for details. */ +/*! + \typedef QRhiShaderResourceBindingSet + \relates QRhi + \since 6.7 + + Synonym for QRhiShaderResourceBindings. +*/ + /*! \internal */ diff --git a/src/gui/rhi/qrhi.h b/src/gui/rhi/qrhi.h index f1620c11fa..f7a49dc292 100644 --- a/src/gui/rhi/qrhi.h +++ b/src/gui/rhi/qrhi.h @@ -1237,6 +1237,11 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QRhiShaderResourceBindings::UpdateFlags) Q_GUI_EXPORT QDebug operator<<(QDebug, const QRhiShaderResourceBindings &); #endif +// The proper name. Until it gets rolled out universally, have the better name +// as a typedef. Eventually it should be reversed (the old name being a typedef +// to the new one). +using QRhiShaderResourceBindingSet = QRhiShaderResourceBindings; + class Q_GUI_EXPORT QRhiGraphicsPipeline : public QRhiResource { public: