AuroraMiddleware/SPIRV-Cross-Vulnerable
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Cross.git synced 2024-11-15 16:30:08 +00:00
Code Issues Projects Releases Wiki Activity

MSL: Make sure get_buffer_block_flags is only used in right context.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2019-03-15 12:27:54 +01:00
parent bc21ccb7ce
commit c310b40fd3
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
spirv_msl.cpp
View File

@ -5438,7 +5438,13 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id)
case StorageClassStorageBuffer:
{
auto flags = id ? get_buffer_block_flags(id) : Bitset();
// This can be called for variable pointer contexts as well, so be very careful about which method we choose.
Bitset flags;
if (ir.ids[id].get_type() == TypeVariable && has_decoration(type.self, DecorationBlock))
flags = get_buffer_block_flags(id);
else
flags = get_decoration_bitset(id);
return flags.get(DecorationNonWritable) ? "const device" : "device";
}
@ -5450,7 +5456,13 @@ string CompilerMSL::get_type_address_space(const SPIRType &type, uint32_t id)
bool ssbo = has_decoration(type.self, DecorationBufferBlock);
if (ssbo)
{
auto flags = id ? get_buffer_block_flags(id) : Bitset();
// This can be called for variable pointer contexts as well, so be very careful about which method we choose.
Bitset flags;
if (ir.ids[id].get_type() == TypeVariable && has_decoration(type.self, DecorationBlock))
flags = get_buffer_block_flags(id);
else
flags = get_decoration_bitset(id);
return flags.get(DecorationNonWritable) ? "const device" : "device";
}
else