diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:16:29 +0200 |
|---|---|---|
| committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2019-10-11 16:23:19 +0200 |
| commit | f4b4c4f79b629498f3cddbbc10df8c1b4d6020d9 (patch) | |
| tree | 4119707660438ff58bd51f9cbe0f9e2a33f4b806 /src/gui/rhi/qshaderdescription.cpp | |
| parent | 9bd6cec74dbbc5aece55dc0c8808494db29b9963 (diff) | |
| parent | 93f2f33a49f6c96a4f94f344edf03164ed944d02 (diff) | |
Merge remote-tracking branch 'origin/wip/qt6' into wip/cmake
Change-Id: I3a1d7673c3c20019ab12a2ea0a60f1619920a34c
Diffstat (limited to 'src/gui/rhi/qshaderdescription.cpp')
| -rw-r--r-- | src/gui/rhi/qshaderdescription.cpp | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/src/gui/rhi/qshaderdescription.cpp b/src/gui/rhi/qshaderdescription.cpp index 77aceaddba..c38a83c497 100644 --- a/src/gui/rhi/qshaderdescription.cpp +++ b/src/gui/rhi/qshaderdescription.cpp @@ -43,7 +43,8 @@ QT_BEGIN_NAMESPACE /*! \class QShaderDescription - \inmodule QtRhi + \internal + \inmodule QtGui \brief Describes the interface of a shader. @@ -231,21 +232,24 @@ QT_BEGIN_NAMESPACE /*! \class QShaderDescription::InOutVariable - \inmodule QtRhi + \internal + \inmodule QtGui \brief Describes an input or output variable in the shader. */ /*! \class QShaderDescription::BlockVariable - \inmodule QtRhi + \internal + \inmodule QtGui \brief Describes a member of a uniform or push constant block. */ /*! \class QShaderDescription::UniformBlock - \inmodule QtRhi + \internal + \inmodule QtGui \brief Describes a uniform block. @@ -257,14 +261,16 @@ QT_BEGIN_NAMESPACE /*! \class QShaderDescription::PushConstantBlock - \inmodule QtRhi + \internal + \inmodule QtGui \brief Describes a push constant block. */ /*! \class QShaderDescription::StorageBlock - \inmodule QtRhi + \internal + \inmodule QtGui \brief Describes a shader storage block. */ |