diff options
| author | assiduous <assiduous@diligentgraphics.com> | 2021-02-14 01:28:04 +0000 |
|---|---|---|
| committer | assiduous <assiduous@diligentgraphics.com> | 2021-03-19 00:31:37 +0000 |
| commit | b6b37364652f9fd8dd6b42c95691162abca11801 (patch) | |
| tree | 0e4a201e2f102d8ef83407d82ac088a7bf595eaa /Graphics/GraphicsEngineD3D12 | |
| parent | RootParamsBuilder: minor improvement to AllocateResourceSlot (diff) | |
| download | DiligentCore-b6b37364652f9fd8dd6b42c95691162abca11801.tar.gz DiligentCore-b6b37364652f9fd8dd6b42c95691162abca11801.zip | |
Removed duplicates of FindImmutableSampler
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
| -rw-r--r-- | Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp index 948398ae..b856e0a3 100644 --- a/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp +++ b/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp @@ -45,25 +45,6 @@ namespace Diligent namespace { -Int32 FindImmutableSampler(const PipelineResourceDesc& Res, - const PipelineResourceSignatureDesc& Desc, - const char* SamplerSuffix) -{ - for (Uint32 s = 0; s < Desc.NumImmutableSamplers; ++s) - { - const auto& ImtblSam = Desc.ImmutableSamplers[s]; - if (((ImtblSam.ShaderStages & Res.ShaderStages) != 0) && StreqSuff(Res.Name, ImtblSam.SamplerOrTextureName, SamplerSuffix)) - { - DEV_CHECK_ERR((ImtblSam.ShaderStages & Res.ShaderStages) == Res.ShaderStages, - "Immutable sampler '", ImtblSam.SamplerOrTextureName, - "' is specified for only some of the shader stages that resource '", Res.Name, "' is defined for."); - return s; - } - } - - return -1; -} - inline bool ResourcesCompatible(const PipelineResourceSignatureD3D12Impl::ResourceAttribs& lhs, const PipelineResourceSignatureD3D12Impl::ResourceAttribs& rhs) { @@ -254,7 +235,7 @@ void PipelineResourceSignatureD3D12Impl::CreateLayout() NumResources[DescriptorRangeType] += ResDesc.ArraySize; const Int32 SrcImmutableSamplerInd = ResDesc.ResourceType == SHADER_RESOURCE_TYPE_SAMPLER ? - FindImmutableSampler(ResDesc, m_Desc, GetCombinedSamplerSuffix()) : + FindImmutableSampler(m_Desc.ImmutableSamplers, m_Desc.NumImmutableSamplers, ResDesc.ShaderStages, ResDesc.Name, GetCombinedSamplerSuffix()) : -1; const auto AssignedSamplerInd = (SrcImmutableSamplerInd == -1 && ResDesc.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV) ? |