From 44bd4b573bc0cc4fe8c9e4234af0e2883d724381 Mon Sep 17 00:00:00 2001 From: jsmall-nvidia Date: Mon, 11 Feb 2019 12:21:38 -0500 Subject: * Use LayoutResourceKind for calcing total num regs used (#838) * Made diagnostic message more compliant + fixed test output * Typo fixes --- source/slang/parameter-binding.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'source/slang/parameter-binding.cpp') diff --git a/source/slang/parameter-binding.cpp b/source/slang/parameter-binding.cpp index 826332b15..89226cdd9 100644 --- a/source/slang/parameter-binding.cpp +++ b/source/slang/parameter-binding.cpp @@ -2742,13 +2742,13 @@ void diagnoseGlobalUniform( getSink(sharedContext)->diagnose(varDecl, Diagnostics::globalUniformsNotSupported, varDecl->getName()); } -static int _calcTotalNumUsedRegistersForParameterCategory(ParameterBindingContext* bindingContext, SlangParameterCategory paramCategory) +static int _calcTotalNumUsedRegistersForLayoutResourceKind(ParameterBindingContext* bindingContext, LayoutResourceKind kind) { int numUsed = 0; for (auto& pair : bindingContext->shared->globalSpaceUsedRangeSets) { UsedRangeSet* rangeSet = pair.Value; - const auto& usedRanges = rangeSet->usedResourceRanges[paramCategory]; + const auto& usedRanges = rangeSet->usedResourceRanges[kind]; for (const auto& usedRange : usedRanges.ranges) { numUsed += int(usedRange.end - usedRange.begin); @@ -2962,7 +2962,7 @@ void generateParameterBindings( programLayout->parametersLayout = globalScopeVarLayout; { - const int numShaderRecordRegs = _calcTotalNumUsedRegistersForParameterCategory(&context, SLANG_PARAMETER_CATEGORY_SHADER_RECORD); + const int numShaderRecordRegs = _calcTotalNumUsedRegistersForLayoutResourceKind(&context, LayoutResourceKind::ShaderRecord); if (numShaderRecordRegs > 1) { compileReq->mSink.diagnose(SourceLoc(), Diagnostics::tooManyShaderRecordConstantBuffers, numShaderRecordRegs); -- cgit v1.2.3