Fix for tile shader, use MAX_RENDER_TARGETS constant instead of magic number

Author: azhirnov

Graphics/GraphicsEngine/include/DeviceContextBase.hpp

@@ -2108,41 +2108,58 @@ inline void DeviceContextBase<ImplementationTraits>::DvpVerifyRenderTargets() co
     DEV_CHECK_ERR(m_pPipelineState, "No pipeline state is bound");
 
     const auto& PSODesc = m_pPipelineState->GetDesc();
-    DEV_CHECK_ERR(PSODesc.IsAnyGraphicsPipeline(),
+    DEV_CHECK_ERR(PSODesc.IsAnyGraphicsPipeline() || PSODesc.IsTilePipeline(),
                   "Pipeline state '", PSODesc.Name, "' is not a graphics pipeline");
 
-    TEXTURE_FORMAT BoundRTVFormats[8] = {TEX_FORMAT_UNKNOWN};
-    TEXTURE_FORMAT BoundDSVFormat     = TEX_FORMAT_UNKNOWN;
-
+    TEXTURE_FORMAT BoundRTVFormats[MAX_RENDER_TARGETS] = {};
     for (Uint32 rt = 0; rt < m_NumBoundRenderTargets; ++rt)
     {
-        if (auto* pRT = m_pBoundRenderTargets[rt].RawPtr())
+        if (const auto* pRT = m_pBoundRenderTargets[rt].RawPtr())
             BoundRTVFormats[rt] = pRT->GetDesc().Format;
         else
             BoundRTVFormats[rt] = TEX_FORMAT_UNKNOWN;
     }
+    const auto BoundDSVFormat = m_pBoundDepthStencil ? m_pBoundDepthStencil->GetDesc().Format : TEX_FORMAT_UNKNOWN;
 
-    BoundDSVFormat = m_pBoundDepthStencil ? m_pBoundDepthStencil->GetDesc().Format : TEX_FORMAT_UNKNOWN;
+    Uint32                NumPipelineRenderTargets = 0;
+    const TEXTURE_FORMAT* PipelineRTVFormats       = nullptr;
+    TEXTURE_FORMAT        PipelineDSVFormat        = TEX_FORMAT_UNKNOWN;
+    if (PSODesc.IsAnyGraphicsPipeline())
+    {
+        const auto& GraphicsPipeline = m_pPipelineState->GetGraphicsPipelineDesc();
+        NumPipelineRenderTargets     = GraphicsPipeline.NumRenderTargets;
+        PipelineRTVFormats           = GraphicsPipeline.RTVFormats;
+        PipelineDSVFormat            = GraphicsPipeline.DSVFormat;
+    }
+    else if (PSODesc.IsTilePipeline())
+    {
+        const auto& TilePipeline = m_pPipelineState->GetTilePipelineDesc();
+        NumPipelineRenderTargets = TilePipeline.NumRenderTargets;
+        PipelineRTVFormats       = TilePipeline.RTVFormats;
+    }
+    else
+    {
+        UNEXPECTED("Unexpected pipeline type");
+    }
 
-    const auto& GraphicsPipeline = m_pPipelineState->GetGraphicsPipelineDesc();
-    if (GraphicsPipeline.NumRenderTargets != m_NumBoundRenderTargets)
+    if (NumPipelineRenderTargets != m_NumBoundRenderTargets)
     {
         LOG_WARNING_MESSAGE("The number of currently bound render targets (", m_NumBoundRenderTargets,
                             ") does not match the number of outputs specified by the PSO '", PSODesc.Name,
-                            "' (", Uint32{GraphicsPipeline.NumRenderTargets}, ").");
+                            "' (", NumPipelineRenderTargets, ").");
     }
 
-    if (BoundDSVFormat != GraphicsPipeline.DSVFormat)
+    if (BoundDSVFormat != PipelineDSVFormat)
     {
         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, ").");
+                            "' (", GetTextureFormatAttribs(PipelineDSVFormat).Name, ").");
     }
 
     for (Uint32 rt = 0; rt < m_NumBoundRenderTargets; ++rt)
     {
         auto BoundFmt = BoundRTVFormats[rt];
-        auto PSOFmt   = GraphicsPipeline.RTVFormats[rt];
+        auto PSOFmt   = PipelineRTVFormats[rt];
         if (BoundFmt != PSOFmt)
         {
             LOG_WARNING_MESSAGE("Render target bound to slot ", rt, " (", GetTextureFormatAttribs(BoundFmt).Name,

Graphics/GraphicsEngine/interface/PipelineState.h

@@ -202,7 +202,7 @@ struct GraphicsPipelineDesc
 
     /// Render target formats.
     /// All formats must be TEX_FORMAT_UNKNOWN when pRenderPass is not null.
-    TEXTURE_FORMAT RTVFormats[8] DEFAULT_INITIALIZER({});
+    TEXTURE_FORMAT RTVFormats[DILIGENT_MAX_RENDER_TARGETS] DEFAULT_INITIALIZER({});
 
     /// Depth-stencil format.
     /// Must be TEX_FORMAT_UNKNOWN when pRenderPass is not null.
@@ -553,7 +553,7 @@ struct TilePipelineDesc
     Uint8 SampleCount            DEFAULT_INITIALIZER(1);
 
     /// Render target formats.
-    TEXTURE_FORMAT RTVFormats[8] DEFAULT_INITIALIZER({});
+    TEXTURE_FORMAT RTVFormats[DILIGENT_MAX_RENDER_TARGETS] DEFAULT_INITIALIZER({});
 };
 typedef struct TilePipelineDesc TilePipelineDesc;
 

Graphics/GraphicsEngineD3D12/src/DeviceContextD3D12Impl.cpp

@@ -1119,7 +1119,7 @@ void DeviceContextD3D12Impl::CommitRenderTargets(RESOURCE_STATE_TRANSITION_MODE
 
     auto& CmdCtx = GetCmdContext();
 
-    D3D12_CPU_DESCRIPTOR_HANDLE RTVHandles[8]; // Do not waste time initializing array to zero
+    D3D12_CPU_DESCRIPTOR_HANDLE RTVHandles[MAX_RENDER_TARGETS]; // Do not waste time initializing array to zero
     D3D12_CPU_DESCRIPTOR_HANDLE DSVHandle = {};
     for (UINT i = 0; i < NumRenderTargets; ++i)
     {

Tests/DiligentCoreAPITest/src/Metal/TileShaderReferenceMtl.mm

@@ -31,7 +31,6 @@
 #include "TextureViewMtl.h"
 
 #include "InlineShaders/TileShaderTestMSL.h"
-#include "RayTracingTestConstants.hpp"
 
 namespace Diligent
 {