commit 39ffdaf2ab1bcd12de39a5b181b44e79d2b8a1cb
author Jeff Bolz <jbolz@nvidia.com> Mon Mar 09 10:48:12 2020 -0500
committer Jeff Bolz <jbolz@nvidia.com> Mon Mar 09 10:48:12 2020 -0500
tree 2c0d2e0af65b4ad8b89161b7f07e87555aea0344
parent f333272eb504735a78f91c76acd814c38ed0c142

Allow nonuniformEXT() on sampler types.

Also add missing NonUniformEXT decoration on OpImageTexelPointer.

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 9409dcc..5787e3d 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -4835,6 +4835,9 @@
                 resultTypeId = builder.makePointer(spv::StorageClassImage, resultType());
             }
             spv::Id pointer = builder.createOp(spv::OpImageTexelPointer, resultTypeId, operands);
+            if (imageType.getQualifier().nonUniform) {
+                builder.addDecoration(pointer, spv::DecorationNonUniformEXT);
+            }
 
             std::vector<spv::Id> operands;
             operands.push_back(pointer);