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

Update tests.

Browse Source
This commit is contained in:
Hans-Kristian Arntzen 2017-11-20 21:10:00 +01:00
parent adebd5ed09
commit 5352615ce1
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
reference/shaders-hlsl/frag/constant-buffer-array.sm51.frag
View File

@ -6,7 +6,7 @@ struct CBO_1
float4 d;
};
ConstantBuffer<CBO_1> cbo[2][4] : register(b4);
ConstantBuffer<CBO_1> cbo[2][4] : register(b4, space0);
cbuffer push
{
float4 PushMe_a : packoffset(c0);

15
spirv_hlsl.cpp
View File

@ -2054,12 +2054,8 @@ string CompilerHLSL::to_resource_binding(const SPIRVariable &var)
// shader model 5.1 supports space
if (options.shader_model >= 51)
return join(" : register(",
space,
get_decoration(var.self, DecorationBinding),
", space",
get_decoration(var.self, DecorationDescriptorSet),
")");
return join(" : register(", space, get_decoration(var.self, DecorationBinding), ", space",
get_decoration(var.self, DecorationDescriptorSet), ")");
else
return join(" : register(", space, get_decoration(var.self, DecorationBinding), ")");
}
@ -2071,11 +2067,8 @@ string CompilerHLSL::to_resource_binding_sampler(const SPIRVariable &var)
return "";
if (options.shader_model >= 51)
return join(" : register(s",
get_decoration(var.self, DecorationBinding),
", space",
get_decoration(var.self, DecorationDescriptorSet),
")");
return join(" : register(s", get_decoration(var.self, DecorationBinding), ", space",
get_decoration(var.self, DecorationDescriptorSet), ")");
else
return join(" : register(s", get_decoration(var.self, DecorationBinding), ")");
}