summaryrefslogtreecommitdiffstats
path: root/Graphics/GraphicsEngineD3D12
diff options
context:
space:
mode:
Diffstat (limited to 'Graphics/GraphicsEngineD3D12')
-rw-r--r--Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp4
-rw-r--r--Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
index 98ff6232..f054f210 100644
--- a/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
+++ b/Graphics/GraphicsEngineD3D12/include/PipelineStateD3D12Impl.hpp
@@ -121,6 +121,7 @@ private:
void Destruct();
+#ifdef DILIGENT_DEVELOPMENT
struct ResourceAttribution
{
static constexpr Uint32 InvalidSignatureIndex = ~0u;
@@ -154,12 +155,11 @@ private:
bool IsImmutableSampler() const
{
- return *this && ImmutableSamplerIndex != InvalidSamplerIndex;
+ return operator bool() && ImmutableSamplerIndex != InvalidSamplerIndex;
}
};
ResourceAttribution GetResourceAttribution(const char* Name, SHADER_TYPE Stage) const;
-#ifdef DILIGENT_DEVELOPMENT
void DvpValidateShaderResources(const ShaderD3D12Impl* pShader, const LocalRootSignatureD3D12* pLocalRootSig);
#endif
diff --git a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
index c98b1090..2dfd4587 100644
--- a/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
+++ b/Graphics/GraphicsEngineD3D12/src/PipelineStateD3D12Impl.cpp
@@ -669,6 +669,7 @@ void PipelineStateD3D12Impl::InitRootSignature(const PipelineStateCreateInfo& Cr
}
+#ifdef DILIGENT_DEVELOPMENT
PipelineStateD3D12Impl::ResourceAttribution PipelineStateD3D12Impl::GetResourceAttribution(const char* Name, SHADER_TYPE Stage) const
{
const auto SignCount = GetResourceSignatureCount();
@@ -691,7 +692,6 @@ PipelineStateD3D12Impl::ResourceAttribution PipelineStateD3D12Impl::GetResourceA
return ResourceAttribution{};
}
-#ifdef DILIGENT_DEVELOPMENT
void PipelineStateD3D12Impl::DvpValidateShaderResources(const ShaderD3D12Impl* pShader, const LocalRootSignatureD3D12* pLocalRootSig)
{
const auto& pShaderResources = pShader->GetShaderResources();