summaryrefslogtreecommitdiffstats
path: root/source/slang/parameter-binding.cpp
diff options
context:
space:
mode:
authorTim Foley <tfoley@nvidia.com>2017-07-14 10:44:42 -0700
committerTim Foley <tfoley@nvidia.com>2017-07-14 11:09:10 -0700
commit2bf87743ffe73f041036ae62c8bf53f09215ca53 (patch)
tree7f8302ad4eb9558e1260ad8aed048f1292092489 /source/slang/parameter-binding.cpp
parent082003a1572d24fa3ff9aa0e0f51bf1154445a70 (diff)
Don't assign a `binding` to a `push_constant` buffer
Fixes #12 - This was a latent issue, but the previous commit brought it to the front. - As indicated in #12, I don't allocate a descriptor-table slot to the block - Instead I allocate a `PushConstantBuffer` - Unlike what #12 asks for, I don't use a different resource type for the contents of the block - Pretty much all the logic is easiest if these continue to be just plain `Uniform` data
Diffstat (limited to 'source/slang/parameter-binding.cpp')
-rw-r--r--source/slang/parameter-binding.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/source/slang/parameter-binding.cpp b/source/slang/parameter-binding.cpp
index 0683c7f8c..01727fb36 100644
--- a/source/slang/parameter-binding.cpp
+++ b/source/slang/parameter-binding.cpp
@@ -101,7 +101,7 @@ struct ParameterBindingInfo
enum
{
- kLayoutResourceKindCount = SLANG_PARAMETER_CATEGORY_MIXED,
+ kLayoutResourceKindCount = SLANG_PARAMETER_CATEGORY_COUNT,
};
// Information on a single parameter
@@ -290,6 +290,11 @@ getTypeLayoutForGlobalShaderParameter_GLSL(
// any more. As such we also inspect the type
// of the variable.
+ // We want to check for a constant-buffer type with a `push_constant` layout
+ // qualifier before we move on to anything else.
+ if (varDecl->HasModifier<GLSLPushConstantLayoutModifier>() && type->As<ConstantBufferType>())
+ return CreateTypeLayout(type, rules->getPushConstantBufferRules());
+
// TODO(tfoley): We have multiple variations of
// the `uniform` modifier right now, and that
// needs to get fixed...