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

Merge pull request #277 from KhronosGroup/pr-274

Browse Source 
Merge PR #274 with Travis fixes
This commit is contained in:
Hans-Kristian Arntzen 2017-09-08 09:35:26 +02:00 committed by GitHub
commit 824d0ad8e7
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ struct _CBO
float4 d;
};
cbuffer CBO : register(c4)
cbuffer CBO : register(b4)
{
_CBO cbo[2][4];
};

2
reference/shaders-hlsl/frag/partial-write-preserve.frag
View File

@ -9,7 +9,7 @@ struct _UBO
int some_value;
};
cbuffer UBO : register(c0)
cbuffer UBO : register(b0)
{
_UBO _42;
};

2
reference/shaders-hlsl/frag/resources.frag
View File

@ -3,7 +3,7 @@ struct _CBuffer
float4 a;
};
cbuffer CBuffer : register(c3)
cbuffer CBuffer : register(b3)
{
_CBuffer cbuf;
};

4
spirv_hlsl.cpp
View File

@ -1690,7 +1690,7 @@ string CompilerHLSL::to_resource_binding(const SPIRVariable &var)
space = "u"; // UAV
else if (has_decoration(type.self, DecorationBlock))
{
if (options.shader_model >= 51)
if (options.shader_model >= 40)
space = "b"; // Constant buffers
else
space = "c"; // Constant buffers
@ -1698,7 +1698,7 @@ string CompilerHLSL::to_resource_binding(const SPIRVariable &var)
}
else if (storage == StorageClassPushConstant)
{
if (options.shader_model >= 51)
if (options.shader_model >= 40)
space = "b"; // Constant buffers
else
space = "c"; // Constant buffers