AuroraMiddleware/SPIRV-Cross
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Get fallback name for block if name is empty.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2018-08-21 12:17:40 +02:00
parent f6ec83e5d4
commit 20c8e6787c
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
spirv_glsl.cpp
View File

@ -1601,11 +1601,16 @@ void CompilerGLSL::emit_interface_block(const SPIRVariable &var)
// Shaders never use the block by interface name, so we don't
// have to track this other than updating name caches.
if (block_namespace.find(block_name) != end(block_namespace))
if (block_name.empty() || block_namespace.find(block_name) != end(block_namespace))
block_name = get_fallback_name(type.self);
else
block_namespace.insert(block_name);
// If for some reason buffer_name is an illegal name, make a final fallback to a workaround name.
// This cannot conflict with anything else, so we're safe now.
if (block_name.empty())
block_name = join("_", get<SPIRType>(var.basetype).self, "_", var.self);
// Instance names cannot alias block names.
resource_names.insert(block_name);