Removed DRAW_FLAG_VERIFY_RENDER_TARGETS flag (API256003)

Author: TheMostDiligent

Graphics/GraphicsEngine/include/DeviceContextBase.hpp

@@ -693,7 +693,8 @@ class DeviceContextBase : public ObjectBase<typename EngineImplTraits::DeviceCon
     std::unordered_map<IBuffer*, DbgMappedBufferInfo> m_DbgMappedBuffers;
 #endif
 #ifdef DILIGENT_DEVELOPMENT
-    int m_DvpDebugGroupCount = 0;
+    int    m_DvpDebugGroupCount         = 0;
+    size_t m_DvpRenderTargetFormatsHash = 0;
 #endif
 };
 
@@ -1178,6 +1179,23 @@ inline bool DeviceContextBase<ImplementationTraits>::SetRenderTargets(const SetR
                           "SHADING_RATE_CAP_FLAG_NON_SUBSAMPLED_RENDER_TARGET capability is not present.");
         }
     }
+
+    {
+        std::array<TEXTURE_FORMAT, MAX_RENDER_TARGETS> RTFormats{};
+        for (Uint32 i = 0; i < m_NumBoundRenderTargets; ++i)
+        {
+            if (TextureViewImplType* pRTV = m_pBoundRenderTargets[i])
+            {
+                RTFormats[i] = pRTV->GetDesc().Format;
+            }
+            else
+            {
+                RTFormats[i] = TEX_FORMAT_UNKNOWN;
+            }
+        }
+        TEXTURE_FORMAT DSVFormat     = m_pBoundDepthStencil ? m_pBoundDepthStencil->GetDesc().Format : TEX_FORMAT_UNKNOWN;
+        m_DvpRenderTargetFormatsHash = ComputeRenderTargetFormatsHash(m_NumBoundRenderTargets, RTFormats.data(), DSVFormat);
+    }
 #endif
 
     if (bBindRenderTargets)
@@ -1429,6 +1447,9 @@ void DeviceContextBase<ImplementationTraits>::ResetRenderTargets()
     m_FramebufferHeight     = 0;
     m_FramebufferSlices     = 0;
     m_FramebufferSamples    = 0;
+#ifdef DILIGENT_DEVELOPMENT
+    m_DvpRenderTargetFormatsHash = 0;
+#endif
 
     m_pBoundDepthStencil.Release();
     m_pBoundShadingRateMap.Release();
@@ -2455,7 +2476,16 @@ inline void DeviceContextBase<ImplementationTraits>::MultiDrawIndexed(const Mult
 template <typename ImplementationTraits>
 inline void DeviceContextBase<ImplementationTraits>::DvpVerifyRenderTargets() const
 {
-    DEV_CHECK_ERR(m_pPipelineState, "No pipeline state is bound");
+    if (!m_pPipelineState)
+    {
+        DEV_ERROR("No pipeline state is bound");
+        return;
+    }
+
+    if (m_DvpRenderTargetFormatsHash == m_pPipelineState->DvpGetRenderTargerFormatsHash())
+    {
+        return;
+    }
 
     const PipelineStateDesc& PSODesc = m_pPipelineState->GetDesc();
     DEV_CHECK_ERR(PSODesc.IsAnyGraphicsPipeline() || PSODesc.IsTilePipeline(),

Graphics/GraphicsEngine/include/PipelineStateBase.hpp

@@ -772,6 +772,13 @@ class PipelineStateBase : public DeviceObjectBase<typename EngineImplTraits::Pip
         return m_ActiveShaderStages;
     }
 
+#ifdef DILIGENT_DEVELOPMENT
+    size_t DvpGetRenderTargerFormatsHash() const
+    {
+        return m_pGraphicsPipelineData ? m_pGraphicsPipelineData->dvpRenderTargetFormatsHash : 0;
+    }
+#endif
+
 protected:
     using TNameToGroupIndexMap = std::unordered_map<HashMapStringKey, Uint32>;
 
@@ -996,6 +1003,11 @@ class PipelineStateBase : public DeviceObjectBase<typename EngineImplTraits::Pip
             pStrides = MemPool.CopyConstructArray<Uint32>(Strides.data(), BufferSlotsUsed);
         }
         GraphicsPipeline.InputLayout.LayoutElements = pLayoutElements;
+
+#ifdef DILIGENT_DEVELOPMENT
+        this->m_pGraphicsPipelineData->dvpRenderTargetFormatsHash = ComputeRenderTargetFormatsHash(
+            GraphicsPipeline.NumRenderTargets, GraphicsPipeline.RTVFormats, GraphicsPipeline.DSVFormat);
+#endif
     }
 
     void InitializePipelineDesc(const ComputePipelineStateCreateInfo& CreateInfo,
@@ -1313,6 +1325,10 @@ class PipelineStateBase : public DeviceObjectBase<typename EngineImplTraits::Pip
 
         Uint32* pStrides        = nullptr;
         Uint8   BufferSlotsUsed = 0;
+
+#ifdef DILIGENT_DEVELOPMENT
+        size_t dvpRenderTargetFormatsHash = 0;
+#endif
     };
 
     struct RayTracingPipelineData

Graphics/GraphicsEngine/interface/APIInfo.h

@@ -30,7 +30,7 @@
 /// \file
 /// Diligent API information
 
-#define DILIGENT_API_VERSION 256002
+#define DILIGENT_API_VERSION 256003
 
 #include "../../../Primitives/interface/BasicTypes.h"
 

Graphics/GraphicsEngine/interface/DeviceContext.h

@@ -1,5 +1,5 @@
 /*
- *  Copyright 2019-2024 Diligent Graphics LLC
+ *  Copyright 2019-2025 Diligent Graphics LLC
  *  Copyright 2015-2019 Egor Yusov
  *
  *  Licensed under the Apache License, Version 2.0 (the "License");
@@ -151,30 +151,24 @@ typedef struct DeviceContextDesc DeviceContextDesc;
 DILIGENT_TYPED_ENUM(DRAW_FLAGS, Uint8)
 {
     /// No flags.
-    DRAW_FLAG_NONE                            = 0x00,
+    DRAW_FLAG_NONE                            = 0u,
 
     /// Verify the state of index and vertex buffers (if any) used by the draw
     /// command. State validation is only performed in debug and development builds
     /// and the flag has no effect in release build.
-    DRAW_FLAG_VERIFY_STATES                   = 0x01,
+    DRAW_FLAG_VERIFY_STATES                   = 1u << 0u,
 
     /// Verify correctness of parameters passed to the draw command.
     ///
     /// \remarks This flag only has effect in debug and development builds.
     ///          Verification is always disabled in release configuration.
-    DRAW_FLAG_VERIFY_DRAW_ATTRIBS             = 0x02,
-
-    /// Verify that render targets bound to the context are consistent with the pipeline state.
-    ///
-    /// \remarks This flag only has effect in debug and development builds.
-    ///          Verification is always disabled in release configuration.
-    DRAW_FLAG_VERIFY_RENDER_TARGETS           = 0x04,
+    DRAW_FLAG_VERIFY_DRAW_ATTRIBS             = 1u << 1u,
 
     /// Perform all state validation checks
     ///
     /// \remarks This flag only has effect in debug and development builds.
     ///          Verification is always disabled in release configuration.
-    DRAW_FLAG_VERIFY_ALL                      = DRAW_FLAG_VERIFY_STATES | DRAW_FLAG_VERIFY_DRAW_ATTRIBS | DRAW_FLAG_VERIFY_RENDER_TARGETS,
+    DRAW_FLAG_VERIFY_ALL                      = DRAW_FLAG_VERIFY_STATES | DRAW_FLAG_VERIFY_DRAW_ATTRIBS,
 
     /// Indicates that none of the dynamic resource buffers used by the draw command
     /// have been modified by the CPU since the last command.
@@ -218,7 +212,7 @@ DILIGENT_TYPED_ENUM(DRAW_FLAGS, Uint8)
     ///          (see RootSignature::CommitRootViews). When DRAW_FLAG_DYNAMIC_RESOURCE_BUFFERS_INTACT is set, root views are only bound
     ///          by the first draw command that uses the PSO + SRB pair. The flag avoids setting the same GPU virtual addresses when
     ///          they stay unchanged.
-    DRAW_FLAG_DYNAMIC_RESOURCE_BUFFERS_INTACT = 0x08
+    DRAW_FLAG_DYNAMIC_RESOURCE_BUFFERS_INTACT = 1u << 2u
 };
 DEFINE_FLAG_ENUM_OPERATORS(DRAW_FLAGS)
 

Graphics/GraphicsEngineD3D11/src/DeviceContextD3D11Impl.cpp

@@ -634,8 +634,7 @@ void DeviceContextD3D11Impl::CommitD3D11VertexBuffers(PipelineStateD3D11Impl* pP
 void DeviceContextD3D11Impl::PrepareForDraw(DRAW_FLAGS Flags)
 {
 #ifdef DILIGENT_DEVELOPMENT
-    if ((Flags & DRAW_FLAG_VERIFY_RENDER_TARGETS) != 0)
-        DvpVerifyRenderTargets();
+    DvpVerifyRenderTargets();
 #endif
 
     auto* pd3d11InputLayout = m_pPipelineState->GetD3D11InputLayout();

Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp

@@ -601,8 +601,7 @@ void DeviceContextD3D12Impl::CommitD3D12VertexBuffers(GraphicsContext& GraphCtx)
 void DeviceContextD3D12Impl::PrepareForDraw(GraphicsContext& GraphCtx, DRAW_FLAGS Flags)
 {
 #ifdef DILIGENT_DEVELOPMENT
-    if ((Flags & DRAW_FLAG_VERIFY_RENDER_TARGETS) != 0)
-        DvpVerifyRenderTargets();
+    DvpVerifyRenderTargets();
 #endif
 
     if (!m_State.bCommittedD3D12VBsUpToDate && m_pPipelineState->GetNumBufferSlotsUsed() > 0)

Graphics/GraphicsEngineOpenGL/src/DeviceContextGLImpl.cpp

@@ -747,8 +747,7 @@ void DeviceContextGLImpl::PrepareForDraw(DRAW_FLAGS Flags, bool IsIndexed, GLenu
     }
 
 #ifdef DILIGENT_DEVELOPMENT
-    if ((Flags & DRAW_FLAG_VERIFY_RENDER_TARGETS) != 0)
-        DvpVerifyRenderTargets();
+    DvpVerifyRenderTargets();
 #endif
 
     // The program might have changed since the last SetPipelineState call if a shader was

Graphics/GraphicsEngineVulkan/src/DeviceContextVkImpl.cpp

@@ -733,9 +733,7 @@ void DeviceContextVkImpl::PrepareForDraw(DRAW_FLAGS Flags)
     }
 
 #ifdef DILIGENT_DEVELOPMENT
-    if ((Flags & DRAW_FLAG_VERIFY_RENDER_TARGETS) != 0)
-        DvpVerifyRenderTargets();
-
+    DvpVerifyRenderTargets();
     VERIFY((m_vkRenderPass != VK_NULL_HANDLE && m_vkFramebuffer != VK_NULL_HANDLE) || m_DynamicRenderingInfo, "No render pass is active while executing draw command");
 #endif
 

Graphics/GraphicsEngineWebGPU/src/DeviceContextWebGPUImpl.cpp

@@ -1986,8 +1986,7 @@ void DeviceContextWebGPUImpl::ClearAttachment(Int32                     RTIndex,
 WGPURenderPassEncoder DeviceContextWebGPUImpl::PrepareForDraw(DRAW_FLAGS Flags)
 {
 #ifdef DILIGENT_DEVELOPMENT
-    if ((Flags & DRAW_FLAG_VERIFY_RENDER_TARGETS) != 0)
-        DvpVerifyRenderTargets();
+    DvpVerifyRenderTargets();
 #endif
     DEV_CHECK_ERR(m_pPipelineState != nullptr, "No PSO is bound in the context");
 

ReleaseHistory.md

@@ -1,5 +1,8 @@
 ## Current progress
 
+* Removed `DRAW_FLAG_VERIFY_RENDER_TARGETS` flag (API256003)
+  * The validation uses render target formats hash, which allows detecting format mismatches
+    without overhead.
 * Added `OpenXRAttribsSize` member to `APIInfo` struct (API256002)
 * Enabled OpenXR (API256001)
   * Added `OpenXRAttribs` struct and `pXRAttribs` member to `EngineCreateInfo` struct