diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-07-14 12:07:45 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 12:07:45 -0700 |
| commit | ffa7f2a9e919be6f155d1c6e62e85827ffc6e3bd (patch) | |
| tree | fb6ab85174f2f630dd49910bc69bb23309f9eee0 /source/slang/parameter-binding.cpp | |
| parent | d9366db8993c566fbb0af780c13db438dbf74022 (diff) | |
| parent | f4ac13d6718d6433f69eb21311110c8225a95aee (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.cpp | 5 |
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; } |
