diff options
| author | Ben Fletcher <ben.fletcher@me.com> | 2022-12-06 19:52:59 -0800 |
|---|---|---|
| committer | Ben Fletcher <ben.fletcher@me.com> | 2022-12-11 11:05:24 -0800 |
| commit | 0943b5d65d1a5699fb2085f4d92c9112fb08871d (patch) | |
| tree | 35fd67535171a6683809149a541b3718b7d0e4b3 /tests/auto/gui/rhi/qshader/tst_qshader.cpp | |
| parent | 2fe3b0e5640df34d5512e06ecbc5739c2d4df21e (diff) | |
RHI: QShaderDescription storage buffer qualifiers / run time stride
Add storage buffer memory qualifier and run time array stride information
to QShaderDescription::StorageBlock.
Memory qualifiers allow more informed selection of RHI resource buffer
binding (bufferLoad / bufferStore / bufferLoadStore) function.
Run time array stride (for last block member unsized array) allows
packing of buffer data for transfer to / from GPU. Without this
information, applications must infer or guess which packing rules
(std430 / std140) are in use.
Change-Id: I676d7e848afefd40d01cdd463c569b07022b683e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'tests/auto/gui/rhi/qshader/tst_qshader.cpp')
| -rw-r--r-- | tests/auto/gui/rhi/qshader/tst_qshader.cpp | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/tests/auto/gui/rhi/qshader/tst_qshader.cpp b/tests/auto/gui/rhi/qshader/tst_qshader.cpp index 26ea56b047..52de60ce55 100644 --- a/tests/auto/gui/rhi/qshader/tst_qshader.cpp +++ b/tests/auto/gui/rhi/qshader/tst_qshader.cpp @@ -26,6 +26,7 @@ private slots: void manualShaderPackCreation(); void loadV6WithSeparateImagesAndSamplers(); void loadV7(); + void loadV8(); }; static QShader getShader(const QString &name) @@ -673,5 +674,27 @@ void tst_QShader::loadV7() QCOMPARE(QShaderPrivate::get(&frag)->qsbVersion, 7); } +void tst_QShader::loadV8() +{ + QShader s = getShader(QLatin1String(":/data/storage_buffer_info_v8.comp.qsb")); + QVERIFY(s.isValid()); + QCOMPARE(QShaderPrivate::get(&s)->qsbVersion, 8); + + const QList<QShaderKey> availableShaders = s.availableShaders(); + QCOMPARE(availableShaders.size(), 5); + QVERIFY(availableShaders.contains(QShaderKey(QShader::SpirvShader, QShaderVersion(100)))); + QVERIFY(availableShaders.contains(QShaderKey(QShader::MslShader, QShaderVersion(12)))); + QVERIFY(availableShaders.contains(QShaderKey(QShader::HlslShader, QShaderVersion(50)))); + QVERIFY(availableShaders.contains( + QShaderKey(QShader::GlslShader, QShaderVersion(310, QShaderVersion::GlslEs)))); + QVERIFY(availableShaders.contains(QShaderKey(QShader::GlslShader, QShaderVersion(430)))); + + QCOMPARE(s.description().storageBlocks().size(), 1); + QCOMPARE(s.description().storageBlocks().last().runtimeArrayStride, 4); + QCOMPARE(s.description().storageBlocks().last().qualifierFlags, + QShaderDescription::QualifierFlags(QShaderDescription::QualifierWriteOnly + | QShaderDescription::QualifierRestrict)); +} + #include <tst_qshader.moc> QTEST_MAIN(tst_QShader) |