commit 13e27f9dd03c27fed02f5d3b17e1e1ddf23974b1
author Jeremy Hayes <jeremy@lunarg.com> Thu Mar 04 18:03:14 2021 -0700
committer Jeremy Hayes <jeremy@lunarg.com> Mon Mar 22 13:42:43 2021 -0600
tree 1e0d6e7c87c72baf2a7575f9f83406fcc260ecf1
parent 6701c2540bb2b49c5768e686cb819579488e8d0a

Default to KHR extension

Fix #2530.

SPIRV/GlslangToSpv.cpp

diff --git a/SPIRV/GlslangToSpv.cpp b/SPIRV/GlslangToSpv.cpp
index 6d9c7cf..9137cc0 100644
--- a/SPIRV/GlslangToSpv.cpp
+++ b/SPIRV/GlslangToSpv.cpp
@@ -1493,7 +1493,7 @@
 
     if (glslangIntermediate->usingPhysicalStorageBuffer()) {
         addressingModel = spv::AddressingModelPhysicalStorageBuffer64EXT;
-        builder.addIncorporatedExtension(spv::E_SPV_EXT_physical_storage_buffer, spv::Spv_1_5);
+        builder.addIncorporatedExtension(spv::E_SPV_KHR_physical_storage_buffer, spv::Spv_1_5);
         builder.addCapability(spv::CapabilityPhysicalStorageBufferAddressesEXT);
     }
     if (glslangIntermediate->usingVulkanMemoryModel()) {
@@ -6836,9 +6836,6 @@
         break;
     case glslang::EOpConvPtrToUvec2:
     case glslang::EOpConvUvec2ToPtr:
-        if (builder.isVector(operand))
-            builder.promoteIncorporatedExtension(spv::E_SPV_EXT_physical_storage_buffer,
-                                                 spv::E_SPV_KHR_physical_storage_buffer, spv::Spv_1_5);
         convOp = spv::OpBitcast;
         break;
 #endif