summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3D12
diff options
context:
space:
mode:
authorassiduous <assiduous@diligentgraphics.com>2021-02-15 03:22:08 +0000
committerassiduous <assiduous@diligentgraphics.com>2021-03-19 00:31:37 +0000
commitc31b32382c9fcf2b79de4c642372fa21383692ab (patch)
treecad423507a7f2134fa045032f02fdf969129559e /Graphics/GraphicsEngineD3D12
parentReworked D3D12 resource signatures to not rely on fixed MAX_SPACES_PER_SIGNAT... (diff)
downloadDiligentCore-c31b32382c9fcf2b79de4c642372fa21383692ab.tar.gz
DiligentCore-c31b32382c9fcf2b79de4c642372fa21383692ab.zip
PipelineResourceSignatureD3D12Impl: fixed issue with binding combined samplers
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
-rw-r--r--Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp5
1 files changed, 1 insertions, 4 deletions
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp
index fe9f17f5..fd6dddf1 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineResourceSignatureD3D12Impl.cpp
@@ -258,8 +258,6 @@ void PipelineResourceSignatureD3D12Impl::CreateLayout()
{
VERIFY_EXPR(ResDesc.ResourceType == SHADER_RESOURCE_TYPE_TEXTURE_SRV);
SrcImmutableSamplerInd = ResourceToImmutableSamplerInd[AssignedSamplerInd];
- if (SrcImmutableSamplerInd >= 0)
- AssignedSamplerInd = ResourceAttribs::InvalidSamplerInd;
}
const auto DescriptorRangeType = ResourceTypeToD3D12DescriptorRangeType(ResDesc.ResourceType);
@@ -1563,8 +1561,7 @@ void BindResourceHelper::BindResource(IDeviceObject* pObj) const
case SHADER_RESOURCE_TYPE_SAMPLER:
//DEV_CHECK_ERR(Signature.IsUsingSeparateSamplers(), "Samplers should not be set directly when using combined texture samplers");
- if (Signature.IsUsingSeparateSamplers())
- CacheSampler(pObj);
+ CacheSampler(pObj);
break;
case SHADER_RESOURCE_TYPE_ACCEL_STRUCT: