BeeEngine/glslang-zig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add missing capability when QueueFamily scope is used

Browse source 
Also, if this capability is added and the memory model is not
otherwise enabled by pragma, enable it as part of postprocessing.
This commit is contained in:
Jeff Bolz 2021-01-27 13:14:34 -06:00
parent 36df92e4a0
commit bfd84a39f2
5 changed files with 65 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
SPIRV/GlslangToSpv.cpp
View file

@ -6996,6 +6996,10 @@ spv::Id TGlslangToSpvTraverser::createAtomicOperation(glslang::TOperator op, spv
builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
}
if (builder.getConstantScalar(scopeId) == spv::ScopeQueueFamily) {
builder.addCapability(spv::CapabilityVulkanMemoryModelKHR);
}
if (glslangIntermediate->usingVulkanMemoryModel() && builder.getConstantScalar(scopeId) == spv::ScopeDevice) {
builder.addCapability(spv::CapabilityVulkanMemoryModelDeviceScopeKHR);
}

7
SPIRV/SpvPostProcess.cpp
View file

@ -436,6 +436,13 @@ void Builder::postProcessFeatures() {
}
}
}
// If any Vulkan memory model-specific functionality is used, update the
// OpMemoryModel to match.
if (capabilities.find(spv::CapabilityVulkanMemoryModelKHR) != capabilities.end()) {
memoryModel = spv::MemoryModelVulkanKHR;
addIncorporatedExtension(spv::E_SPV_KHR_vulkan_memory_model, spv::Spv_1_5);
}
}
#endif