summaryrefslogtreecommitdiffstats
path: root/source/slang/parameter-binding.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoleyNV@users.noreply.github.com>2017-07-14 12:07:45 -0700
committerGitHub <noreply@github.com>2017-07-14 12:07:45 -0700
commitffa7f2a9e919be6f155d1c6e62e85827ffc6e3bd (patch)
treefb6ab85174f2f630dd49910bc69bb23309f9eee0 /source/slang/parameter-binding.cpp
parentd9366db8993c566fbb0af780c13db438dbf74022 (diff)
parentf4ac13d6718d6433f69eb21311110c8225a95aee (diff)
Merge pull request #90 from tfoleyNV/cbuffer-field-layout-fix
Adjust type layout when parameter block constains member using the sa…
Diffstat (limited to 'source/slang/parameter-binding.cpp')
-rw-r--r--source/slang/parameter-binding.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/slang/parameter-binding.cpp b/source/slang/parameter-binding.cpp
index 01727fb36..007c023e2 100644
--- a/source/slang/parameter-binding.cpp
+++ b/source/slang/parameter-binding.cpp
@@ -1342,8 +1342,9 @@ void generateParameterBindings(
{
auto globalConstantBufferLayout = createParameterBlockTypeLayout(
nullptr,
- globalScopeStructLayout,
- globalScopeRules);
+ globalScopeRules,
+ globalScopeRules->GetObjectLayout(ShaderParameterKind::ConstantBuffer),
+ globalScopeStructLayout);
globalScopeLayout = globalConstantBufferLayout;
}