diff options
Diffstat (limited to 'source/slang/parameter-binding.cpp')
| -rw-r--r-- | source/slang/parameter-binding.cpp | 7 |
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... |