diff options
| author | Jim Albamont <jim.albamont@kdab.com> | 2020-12-10 11:41:44 -0800 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-28 10:54:16 +0000 |
| commit | 445d7b0d2a72c3581775c09f27ee9f1d7f3a25e6 (patch) | |
| tree | c53c7ac7f9fedf6cdc6d8eda78e7f4f271babad9 | |
| parent | 91e506d47fde60225375e54f154c5ac9096380f0 (diff) | |
Fix sampler2DArrayShadow uniform in QShaderGenerator
Also update the test
Change-Id: I23d897f40747192687e632d21aa8fe2f57645909
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
(cherry picked from commit 077b1281ca376a39a5815b112e8e067cdc9165f4)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/render/shadergraph/qshadergenerator.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/render/shadergraph/qshadergenerator.cpp b/src/render/shadergraph/qshadergenerator.cpp index 9bbc2b2d2..ec280e908 100644 --- a/src/render/shadergraph/qshadergenerator.cpp +++ b/src/render/shadergraph/qshadergenerator.cpp @@ -213,7 +213,7 @@ namespace case QShaderLanguage::Sampler1DArrayShadow: return "sampler1DArrayShadow"; case QShaderLanguage::Sampler2DArrayShadow: - return "sample2DArrayShadow"; + return "sampler2DArrayShadow"; case QShaderLanguage::SamplerCubeShadow: return "samplerCubeShadow"; case QShaderLanguage::SamplerCubeArrayShadow: diff --git a/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp b/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp index 8a7ca964e..86aab00f9 100644 --- a/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp +++ b/tests/auto/render/shadergraph/qshadergenerator/tst_qshadergenerator.cpp @@ -516,7 +516,7 @@ namespace { case QShaderLanguage::Sampler1DArrayShadow: return "sampler1DArrayShadow"; case QShaderLanguage::Sampler2DArrayShadow: - return "sample2DArrayShadow"; + return "sampler2DArrayShadow"; case QShaderLanguage::SamplerCubeShadow: return "samplerCubeShadow"; case QShaderLanguage::SamplerCubeArrayShadow: |