Added DRAW_FLAG_VERIFY_DRAW_ATTRIBS, DRAW_FLAG_VERIFY_RENDER_TARGETS, and DRAW_FLAG_VERIFY_ALL flags (updated API Version to 240022)

3 files changed, 12 insertions, 70 deletions

diff --git a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.h b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.h
index 01a54eeb..bc5c87a6 100755
--- a/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.h
+++ b/Graphics/GraphicsEngineD3D11/include/DeviceContextD3D11Impl.h
@@ -297,8 +297,6 @@ private:
     FixedBlockMemoryAllocator m_CmdListAllocator;

 

 #ifdef VERIFY_CONTEXT_BINDINGS

-    /// Verifies that bound render target formats are consistent with the PSO

-    void dbgVerifyRenderTargetFormats();

 

     /// Helper template function used to facilitate context verification

     template<UINT MaxResources, typename TD3D11ResourceType, typename TGetD3D11ResourcesType>

diff --git a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
index df4a59c3..d5f074c5 100755
--- a/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp
@@ -733,10 +733,14 @@ namespace Diligent
     void DeviceContextD3D11Impl::Draw( DrawAttribs &drawAttribs )

     {

 #ifdef DEVELOPMENT

-        if (!DvpVerifyDrawArguments(drawAttribs))

+        if ((drawAttribs.Flags & DRAW_FLAG_VERIFY_DRAW_ATTRIBS) != 0 && !DvpVerifyDrawArguments(drawAttribs))

             return;

+

+        if ((drawAttribs.Flags & DRAW_FLAG_VERIFY_RENDER_TARGETS) != 0)

+            DvpVerifyRenderTargets();

 #endif

-        const bool VerifyStates = drawAttribs.Flags & DRAW_FLAG_VERIFY_STATES;

+

+        const bool VerifyStates = (drawAttribs.Flags & DRAW_FLAG_VERIFY_STATES) != 0;

         auto* pd3d11InputLayout = m_pPipelineState->GetD3D11InputLayout();

         if (pd3d11InputLayout != nullptr && !m_bCommittedD3D11VBsUpToDate)

         {

@@ -786,7 +790,6 @@ namespace Diligent
         if(m_DebugFlags & (Uint32)EngineD3D11DebugFlags::VerifyCommittedResourceRelevance)

         {

             // Verify bindings after all resources are set

-            dbgVerifyRenderTargetFormats();

             dbgVerifyCommittedSRVs();

             dbgVerifyCommittedUAVs(SHADER_TYPE_COMPUTE);

             dbgVerifyCommittedSamplers();

@@ -1969,68 +1972,6 @@ namespace Diligent
     }

 

 #ifdef VERIFY_CONTEXT_BINDINGS

-    void DeviceContextD3D11Impl::dbgVerifyRenderTargetFormats()

-    {

-        if (!m_pPipelineState)

-        {

-            LOG_ERROR("No pipeline state is bound");

-            return;

-        }

-

-        TEXTURE_FORMAT BoundRTVFormats[8] = {TEX_FORMAT_UNKNOWN};

-        TEXTURE_FORMAT BoundDSVFormat = TEX_FORMAT_UNKNOWN;

-        Uint32 NumBoundRTVs = 0;

-        if (m_IsDefaultFramebufferBound)

-        {

-            if (m_pSwapChain)

-            {

-                BoundRTVFormats[0] = m_pSwapChain->GetDesc().ColorBufferFormat;

-                BoundDSVFormat = m_pSwapChain->GetDesc().DepthBufferFormat;

-                NumBoundRTVs = 1;

-            }

-            else

-            {

-                LOG_WARNING_MESSAGE("Failed to get bound render targets and depth-stencil buffer: swap chain is not initialized in the device context");

-                return;

-            }

-        }

-        else

-        {

-            NumBoundRTVs = m_NumBoundRenderTargets;

-            for (Uint32 rt = 0; rt < NumBoundRTVs; ++rt)

-            {

-                if (auto* pRT = m_pBoundRenderTargets[rt].RawPtr())

-                    BoundRTVFormats[rt] = pRT->GetDesc().Format;

-                else

-                    BoundRTVFormats[rt] = TEX_FORMAT_UNKNOWN;

-            }

-

-            BoundDSVFormat = m_pBoundDepthStencil ? m_pBoundDepthStencil->GetDesc().Format : TEX_FORMAT_UNKNOWN;

-        }

-

-        const auto &PSODesc = m_pPipelineState->GetDesc();

-        const auto &GraphicsPipeline = PSODesc.GraphicsPipeline;

-        if (GraphicsPipeline.NumRenderTargets != NumBoundRTVs)

-        {

-            LOG_WARNING_MESSAGE("Number of currently bound render targets (", NumBoundRTVs, ") does not match the number of outputs specified by the PSO '", PSODesc.Name, "' (", GraphicsPipeline.NumRenderTargets, "). This is OK on D3D11 device, but will be an issue on Vulkan and D3D12." );

-        }

-

-        if (BoundDSVFormat != GraphicsPipeline.DSVFormat)

-        {

-            LOG_WARNING_MESSAGE("Currently bound depth-stencil buffer format (", GetTextureFormatAttribs(BoundDSVFormat).Name, ") does not match the DSV format specified by the PSO '", PSODesc.Name, "' (", GetTextureFormatAttribs(GraphicsPipeline.DSVFormat).Name, "). This is OK on D3D11 device, but will be an issue on Vulkan and D3D12." );

-        }

-        

-        for (Uint32 rt = 0; rt < NumBoundRTVs; ++rt)

-        {

-            auto BoundFmt = BoundRTVFormats[rt];

-            auto PSOFmt = GraphicsPipeline.RTVFormats[rt];

-            if (BoundFmt != PSOFmt)

-            {

-                LOG_WARNING_MESSAGE("Render target bound to slot ", rt, " (", GetTextureFormatAttribs(BoundFmt).Name, ") does not match the RTV format specified by the PSO '", PSODesc.Name, "' (", GetTextureFormatAttribs(PSOFmt).Name, "). This is OK on D3D11 device, but will be an issue on Vulkan and D3D12." );

-            }

-        }

-    }

-

     DEFINE_D3D11CTX_FUNC_POINTERS(GetCBMethods,      GetConstantBuffers)

     DEFINE_D3D11CTX_FUNC_POINTERS(GetSRVMethods,     GetShaderResources)

     DEFINE_D3D11CTX_FUNC_POINTERS(GetSamplerMethods, GetSamplers)

diff --git a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp
index 5d3ffe4b..40b6cd38 100644
--- a/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp
+++ b/Graphics/GraphicsEngineD3D11/src/ShaderResourceBindingD3D11Impl.cpp
@@ -171,7 +171,8 @@ IShaderResourceVariable* ShaderResourceBindingD3D11Impl::GetVariableByName(SHADE
     auto ResLayoutIndex = m_ResourceLayoutIndex[Ind];
     if( ResLayoutIndex < 0 )
     {
-        LOG_WARNING_MESSAGE("Unable to find mutable/dynamic variable '", Name, "': shader stage ", GetShaderTypeLiteralName(ShaderType), " is inactive");
+        LOG_WARNING_MESSAGE("Unable to find mutable/dynamic variable '", Name, "': shader stage ", GetShaderTypeLiteralName(ShaderType),
+                            " is inactive in Pipeline State '", m_pPSO->GetDesc().Name, "'");
         return nullptr;
     }
 
@@ -185,7 +186,8 @@ Uint32 ShaderResourceBindingD3D11Impl::GetVariableCount(SHADER_TYPE ShaderType)
     auto ResLayoutIndex = m_ResourceLayoutIndex[Ind];
     if( ResLayoutIndex < 0 )
     {
-        LOG_WARNING_MESSAGE("Unable to get the number of mutable/dynamic variables: shader stage ", GetShaderTypeLiteralName(ShaderType), " is inactive");
+        LOG_WARNING_MESSAGE("Unable to get the number of mutable/dynamic variables: shader stage ", GetShaderTypeLiteralName(ShaderType),
+                            " is inactive in Pipeline State '", m_pPSO->GetDesc().Name, "'");
         return 0;
     }
 
@@ -199,7 +201,8 @@ IShaderResourceVariable* ShaderResourceBindingD3D11Impl::GetVariableByIndex(SHAD
     auto ResLayoutIndex = m_ResourceLayoutIndex[Ind];
     if( ResLayoutIndex < 0 )
     {
-        LOG_ERROR("Unable to get mutable/dynamic variable at index ", Index, ": shader stage ", GetShaderTypeLiteralName(ShaderType), " is inactive");
+        LOG_WARNING_MESSAGE("Unable to get mutable/dynamic variable at index ", Index, ": shader stage ", GetShaderTypeLiteralName(ShaderType),
+                            " is inactive in Pipeline State '", m_pPSO->GetDesc().Name, "'");
         return nullptr;
     }