Merge pull request #1851 from KhronosGroup/fix-1835

Handle aliased names in spec constants.

1 files changed, 3 insertions, 0 deletions

diff --git a/spirv_hlsl.cpp b/spirv_hlsl.cpp
index efd8f99f..3d834774 100644
--- a/spirv_hlsl.cpp
+++ b/spirv_hlsl.cpp
@@ -1167,6 +1167,7 @@ void CompilerHLSL::emit_composite_constants()
 
 		if (type.basetype == SPIRType::Struct || !type.array.empty())
 		{
+			add_resource_name(c.self);
 			auto name = to_name(c.self);
 			statement("static const ", variable_decl(type, name), " = ", constant_expression(c), ";");
 			emitted = true;
@@ -1213,6 +1214,7 @@ void CompilerHLSL::emit_specialization_constants_and_structs()
 			else if (c.specialization)
 			{
 				auto &type = get<SPIRType>(c.constant_type);
+				add_resource_name(c.self);
 				auto name = to_name(c.self);
 
 				if (has_decoration(c.self, DecorationSpecId))
@@ -1236,6 +1238,7 @@ void CompilerHLSL::emit_specialization_constants_and_structs()
 		{
 			auto &c = id.get<SPIRConstantOp>();
 			auto &type = get<SPIRType>(c.basetype);
+			add_resource_name(c.self);
 			auto name = to_name(c.self);
 			statement("static const ", variable_decl(type, name), " = ", constant_op_expression(c), ";");
 			emitted = true;