From 10abc7082d9c6dcf99dd0e40ea4fb2fd3798ee91 Mon Sep 17 00:00:00 2001 From: Egor Yusov Date: Sun, 28 Oct 2018 17:38:13 -0700 Subject: Minor changes to ShaderResourceLayoutVk --- Graphics/GLSLTools/src/SPIRVShaderResources.cpp | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'Graphics/GLSLTools') diff --git a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp index 8b205807..3e69cae9 100644 --- a/Graphics/GLSLTools/src/SPIRVShaderResources.cpp +++ b/Graphics/GLSLTools/src/SPIRVShaderResources.cpp @@ -253,8 +253,7 @@ SPIRVShaderResources::SPIRVShaderResources(IMemoryAllocator& Allocator, { SepSmplr.AssignSeparateImage(CurrSepImg); // Do no assign immutable samplers to separate images as immutable - // samplers are initialized in the pipeline layout and never bound - // at run time. + // samplers are permanently bound into the set layout if (SepSmplr.IsImmutableSamplerAssigned()) SamplerInd = NumSepSmpls; break; @@ -595,13 +594,13 @@ std::string SPIRVShaderResources::DumpResources() bool SPIRVShaderResources::IsCompatibleWith(const SPIRVShaderResources& Resources)const { - if( GetNumUBs() != Resources.GetNumUBs() || - GetNumSBs() != Resources.GetNumSBs() || - GetNumImgs() != Resources.GetNumImgs() || - GetNumSmpldImgs() != Resources.GetNumSmpldImgs() || - GetNumACs() != Resources.GetNumACs() || - GetNumSepImgs() != Resources.GetNumSepImgs() || - GetNumSepSmplrs() != Resources.GetNumSepSmplrs() || + if( GetNumUBs() != Resources.GetNumUBs() || + GetNumSBs() != Resources.GetNumSBs() || + GetNumImgs() != Resources.GetNumImgs() || + GetNumSmpldImgs() != Resources.GetNumSmpldImgs() || + GetNumACs() != Resources.GetNumACs() || + GetNumSepImgs() != Resources.GetNumSepImgs() || + GetNumSepSmplrs() != Resources.GetNumSepSmplrs() || GetNumImmutableSamplers() != Resources.GetNumImmutableSamplers() ) return false; VERIFY_EXPR(GetTotalResources() == Resources.GetTotalResources()); -- cgit v1.2.3