store desc

src/d3d11/d3d11-device.cpp

@@ -369,21 +369,7 @@ Result DeviceImpl::createSwapchain(const ISwapchain::Desc& desc, WindowHandle wi
 Result DeviceImpl::createFramebufferLayout(const FramebufferLayoutDesc& desc, IFramebufferLayout** outLayout)
 {
     RefPtr<FramebufferLayoutImpl> layout = new FramebufferLayoutImpl();
-    layout->m_renderTargets.resize(desc.renderTargetCount);
-    for (GfxIndex i = 0; i < desc.renderTargetCount; i++)
-    {
-        layout->m_renderTargets[i] = desc.renderTargets[i];
-    }
-
-    if (desc.depthStencil.format != Format::Unknown)
-    {
-        layout->m_hasDepthStencil = true;
-        layout->m_depthStencil = desc.depthStencil;
-    }
-    else
-    {
-        layout->m_hasDepthStencil = false;
-    }
+    layout->m_desc = desc;
     returnComPtr(outLayout, layout);
     return SLANG_OK;
 }
@@ -1681,7 +1667,7 @@ Result DeviceImpl::createRenderPipeline(const RenderPipelineDesc& inDesc, IPipel
     pipeline->m_rasterizerState = rasterizerState;
     pipeline->m_blendState = blendState;
     pipeline->m_inputLayout = static_cast<InputLayoutImpl*>(desc.inputLayout);
-    pipeline->m_rtvCount = (UINT) static_cast<FramebufferLayoutImpl*>(desc.framebufferLayout)->m_renderTargets.size();
+    pipeline->m_rtvCount = (UINT) static_cast<FramebufferLayoutImpl*>(desc.framebufferLayout)->m_desc.renderTargetCount;
     pipeline->m_blendColor[0] = 0;
     pipeline->m_blendColor[1] = 0;
     pipeline->m_blendColor[2] = 0;

src/d3d11/d3d11-framebuffer.h

@@ -15,9 +15,7 @@ enum
 class FramebufferLayoutImpl : public FramebufferLayoutBase
 {
 public:
-    short_vector<TargetLayoutDesc> m_renderTargets;
-    bool m_hasDepthStencil = false;
-    TargetLayoutDesc m_depthStencil;
+    FramebufferLayoutDesc m_desc;
 };
 
 class FramebufferImpl : public FramebufferBase

src/d3d12/d3d12-device.cpp

@@ -1709,21 +1709,7 @@ Result DeviceImpl::createFramebuffer(IFramebuffer::Desc const& desc, IFramebuffe
 Result DeviceImpl::createFramebufferLayout(FramebufferLayoutDesc const& desc, IFramebufferLayout** outLayout)
 {
     RefPtr<FramebufferLayoutImpl> layout = new FramebufferLayoutImpl();
-    layout->m_renderTargets.resize(desc.renderTargetCount);
-    for (GfxIndex i = 0; i < desc.renderTargetCount; i++)
-    {
-        layout->m_renderTargets[i] = desc.renderTargets[i];
-    }
-
-    if (desc.depthStencil.format != Format::Unknown)
-    {
-        layout->m_hasDepthStencil = true;
-        layout->m_depthStencil = desc.depthStencil;
-    }
-    else
-    {
-        layout->m_hasDepthStencil = false;
-    }
+    layout->m_desc = desc;
     returnComPtr(outLayout, layout);
     return SLANG_OK;
 }

src/d3d12/d3d12-framebuffer.h

@@ -10,9 +10,7 @@ namespace rhi::d3d12 {
 class FramebufferLayoutImpl : public FramebufferLayoutBase
 {
 public:
-    short_vector<TargetLayoutDesc> m_renderTargets;
-    bool m_hasDepthStencil = false;
-    TargetLayoutDesc m_depthStencil;
+    FramebufferLayoutDesc m_desc;
 };
 
 class FramebufferImpl : public FramebufferBase

src/d3d12/d3d12-pipeline.cpp

@@ -68,25 +68,25 @@ Result PipelineImpl::ensureAPIPipelineCreated()
 
             {
                 auto framebufferLayout = static_cast<FramebufferLayoutImpl*>(desc.graphics.framebufferLayout);
-                const int numRenderTargets = int(framebufferLayout->m_renderTargets.size());
+                const int numRenderTargets = int(framebufferLayout->m_desc.renderTargetCount);
 
-                if (framebufferLayout->m_hasDepthStencil)
+                if (framebufferLayout->m_desc.depthStencil.format != Format::Unknown)
                 {
-                    psoDesc.DSVFormat = D3DUtil::getMapFormat(framebufferLayout->m_depthStencil.format);
-                    psoDesc.SampleDesc.Count = framebufferLayout->m_depthStencil.sampleCount;
+                    psoDesc.DSVFormat = D3DUtil::getMapFormat(framebufferLayout->m_desc.depthStencil.format);
+                    psoDesc.SampleDesc.Count = framebufferLayout->m_desc.depthStencil.sampleCount;
                 }
                 else
                 {
                     psoDesc.DSVFormat = DXGI_FORMAT_UNKNOWN;
-                    if (framebufferLayout->m_renderTargets.size())
+                    if (numRenderTargets > 0)
                     {
-                        psoDesc.SampleDesc.Count = framebufferLayout->m_renderTargets[0].sampleCount;
+                        psoDesc.SampleDesc.Count = framebufferLayout->m_desc.renderTargets[0].sampleCount;
                     }
                 }
                 psoDesc.NumRenderTargets = numRenderTargets;
                 for (Int i = 0; i < numRenderTargets; i++)
                 {
-                    psoDesc.RTVFormats[i] = D3DUtil::getMapFormat(framebufferLayout->m_renderTargets[i].format);
+                    psoDesc.RTVFormats[i] = D3DUtil::getMapFormat(framebufferLayout->m_desc.renderTargets[0].format);
                 }
 
                 psoDesc.SampleDesc.Quality = 0;

src/d3d12/d3d12-render-pass.cpp

@@ -6,7 +6,7 @@ void RenderPassLayoutImpl::init(const IRenderPassLayout::Desc& desc)
 {
     SimpleRenderPassLayout::init(desc);
     m_framebufferLayout = static_cast<FramebufferLayoutImpl*>(desc.framebufferLayout);
-    m_hasDepthStencil = m_framebufferLayout->m_hasDepthStencil;
+    m_hasDepthStencil = m_framebufferLayout->m_desc.depthStencil.format != Format::Unknown;
 }
 
 } // namespace rhi::d3d12

src/metal/metal-framebuffer.cpp

@@ -7,18 +7,7 @@ namespace rhi::metal {
 
 Result FramebufferLayoutImpl::init(const FramebufferLayoutDesc& desc)
 {
-    for (Index i = 0; i < desc.renderTargetCount; ++i)
-    {
-        m_renderTargets.push_back(desc.renderTargets[i]);
-    }
-    if (desc.depthStencil.format != Format::Unknown)
-    {
-        m_depthStencil = desc.depthStencil;
-    }
-    else
-    {
-        m_depthStencil = {};
-    }
+    m_desc = desc;
     return SLANG_OK;
 }
 

src/metal/metal-framebuffer.h

@@ -17,8 +17,7 @@ enum
 class FramebufferLayoutImpl : public FramebufferLayoutBase
 {
 public:
-    std::vector<TargetLayoutDesc> m_renderTargets;
-    TargetLayoutDesc m_depthStencil;
+    FramebufferLayoutDesc m_desc;
 
 public:
     Result init(const FramebufferLayoutDesc& desc);

src/metal/metal-pipeline.cpp

@@ -85,9 +85,9 @@ Result PipelineImpl::createMetalRenderPipelineState()
     // pd->setAlphaToOneEnabled(); // Currently not supported by rhi
     // pd->setRasterizationEnabled(true); // Enabled by default
 
-    for (Index i = 0; i < framebufferLayoutImpl->m_renderTargets.size(); ++i)
+    for (Index i = 0; i < framebufferLayoutImpl->m_desc.renderTargetCount; ++i)
     {
-        const TargetLayoutDesc& targetLayout = framebufferLayoutImpl->m_renderTargets[i];
+        const TargetLayoutDesc& targetLayout = framebufferLayoutImpl->m_desc.renderTargets[i];
         MTL::RenderPipelineColorAttachmentDescriptor* colorAttachment = pd->colorAttachments()->object(i);
         colorAttachment->setPixelFormat(MetalUtil::translatePixelFormat(targetLayout.format));
         if (i < blend.targetCount)
@@ -109,9 +109,9 @@ Result PipelineImpl::createMetalRenderPipelineState()
         }
         sampleCount = std::max(sampleCount, targetLayout.sampleCount);
     }
-    if (framebufferLayoutImpl->m_depthStencil.format != Format::Unknown)
+    if (framebufferLayoutImpl->m_desc.depthStencil.format != Format::Unknown)
     {
-        const TargetLayoutDesc& depthStencil = framebufferLayoutImpl->m_depthStencil;
+        const TargetLayoutDesc& depthStencil = framebufferLayoutImpl->m_desc.depthStencil;
         MTL::PixelFormat pixelFormat = MetalUtil::translatePixelFormat(depthStencil.format);
         if (MetalUtil::isDepthFormat(pixelFormat))
         {