commit 61a0cd19ccce599aca9439f50a52c70f56afa074
author Jeff Bolz <jbolz@nvidia.com> Fri Dec 14 20:59:53 2018 -0600
committer Jeff Bolz <jbolz@nvidia.com> Fri Dec 14 20:59:53 2018 -0600
tree 33c8decbd4501bbee635965020269f7a3ef11d7b
parent b23d232ec5222a168d248d757b8bdb71c75241cb

Fix bug where shaderRecordNV buffers were using StorageBuffer storage class

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
old mode 100755
new mode 100644
index 7d9c8e1..0cc0590
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1088,6 +1088,13 @@
             return spv::StorageClassUniformConstant;
     }
 
+#ifdef NV_EXTENSIONS
+    if (type.getQualifier().isUniformOrBuffer() &&
+        type.getQualifier().layoutShaderRecordNV) {
+        return spv::StorageClassShaderRecordBufferNV;
+    }
+#endif
+
     if (glslangIntermediate->usingStorageBuffer() && type.getQualifier().storage == glslang::EvqBuffer) {
         addPre13Extension(spv::E_SPV_KHR_storage_buffer_storage_class);
         return spv::StorageClassStorageBuffer;
@@ -1096,10 +1103,6 @@
     if (type.getQualifier().isUniformOrBuffer()) {
         if (type.getQualifier().layoutPushConstant)
             return spv::StorageClassPushConstant;
-#ifdef NV_EXTENSIONS
-        if (type.getQualifier().layoutShaderRecordNV)
-            return spv::StorageClassShaderRecordBufferNV;
-#endif
         if (type.getBasicType() == glslang::EbtBlock)
             return spv::StorageClassUniform;
         return spv::StorageClassUniformConstant;