Fixes to MultiDeviceRayTracingTlas and MultiDeviceDrawPacket (o3de#17486)

martinwinter-huawei · jhmueller-huawei · web-flow · commit 724286dbf448 · 2024-02-20T15:22:07.000+01:00
Fixes to MDRT and MDDP

Signed-off-by: Martin Winter &lt;martin.winter@huawei.com&gt;
Signed-off-by: Joerg H. Mueller &lt;joerg.mueller@huawei.com&gt;
Co-authored-by: Joerg H. Mueller &lt;joerg.mueller@huawei.com&gt;
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceDrawItem.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceDrawItem.h
@@ -90,6 +90,12 @@ namespace AZ::RHI
 
         MultiDeviceDrawItem(MultiDevice::DeviceMask deviceMask, AZStd::unordered_map<int, DrawItem*>&& deviceDrawItemPtrs);
 
+        MultiDeviceDrawItem(const MultiDeviceDrawItem& other) = delete;
+        MultiDeviceDrawItem(MultiDeviceDrawItem&& other) = default;
+
+        MultiDeviceDrawItem& operator=(const MultiDeviceDrawItem& other) = delete;
+        MultiDeviceDrawItem& operator=(MultiDeviceDrawItem&& other) = default;
+
         //! Returns the device-specific DrawItem for the given index
         const DrawItem& GetDeviceDrawItem(int deviceIndex) const
         {
diff --git a/Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceDrawPacketBuilder.h b/Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceDrawPacketBuilder.h
@@ -30,7 +30,7 @@ namespace AZ::RHI
             MultiDeviceDrawRequest() = default;
 
             //! Returns the device-specific DrawRequest for the given index
-            DrawPacketBuilder::DrawRequest BuildDeviceDrawRequest(int deviceIndex);
+            DrawPacketBuilder::DrawRequest GetDeviceDrawRequest(int deviceIndex);
 
             //! The filter tag used to direct the draw item.
             DrawListTag m_listTag;
diff --git a/Gems/Atom/RHI/Code/Source/RHI/MultiDeviceDrawPacketBuilder.cpp b/Gems/Atom/RHI/Code/Source/RHI/MultiDeviceDrawPacketBuilder.cpp
@@ -16,7 +16,8 @@
 
 namespace AZ::RHI
 {
-    DrawPacketBuilder::DrawRequest MultiDeviceDrawPacketBuilder::MultiDeviceDrawRequest::BuildDeviceDrawRequest(int deviceIndex)
+    DrawPacketBuilder::DrawRequest MultiDeviceDrawPacketBuilder::MultiDeviceDrawRequest::
+        GetDeviceDrawRequest(int deviceIndex)
     {
         if (!m_deviceStreamBufferViews.contains(deviceIndex))
         {
@@ -28,14 +29,14 @@ namespace AZ::RHI
             }
             m_deviceStreamBufferViews.emplace(deviceIndex, AZStd::move(deviceStreamBufferView));
         }
-
-        return { m_listTag,
-                 m_stencilRef,
-                 m_deviceStreamBufferViews.at(deviceIndex),
-                 m_uniqueShaderResourceGroup ? m_uniqueShaderResourceGroup->GetDeviceShaderResourceGroup(deviceIndex).get() : nullptr,
-                 m_pipelineState ? m_pipelineState->GetDevicePipelineState(deviceIndex).get() : nullptr,
-                 m_sortKey,
-                 m_drawFilterMask };
+        return DrawPacketBuilder::DrawRequest{
+                m_listTag,
+                m_stencilRef,
+                m_deviceStreamBufferViews.at(deviceIndex),
+                m_uniqueShaderResourceGroup ? m_uniqueShaderResourceGroup->GetDeviceShaderResourceGroup(deviceIndex).get() : nullptr,
+                m_pipelineState ? m_pipelineState->GetDevicePipelineState(deviceIndex).get() : nullptr,
+                m_sortKey,
+                m_drawFilterMask };
     }
 
     void MultiDeviceDrawPacketBuilder::Begin(IAllocator* allocator)
@@ -122,7 +123,7 @@ namespace AZ::RHI
             m_drawPacketInFlight->m_drawListMask.set(request.m_listTag.GetIndex());
             for (auto& [deviceIndex, deviceDrawPacketBuilder] : m_deviceDrawPacketBuilders)
             {
-                deviceDrawPacketBuilder.AddDrawItem(request.BuildDeviceDrawRequest(deviceIndex));
+                deviceDrawPacketBuilder.AddDrawItem(m_drawRequests.back().GetDeviceDrawRequest(deviceIndex));
             }
         }
         else
@@ -149,12 +150,12 @@ namespace AZ::RHI
         m_drawPacketInFlight->m_drawItems.reserve(m_drawRequests.size());
 
         // Setup single-device DrawItems
-        for (auto i{ 0 }; i < m_drawRequests.size(); ++i)
+        for (auto drawItemIndex{ 0 }; drawItemIndex < m_drawRequests.size(); ++drawItemIndex)
         {
             AZStd::unordered_map<int, DrawItem*> deviceDrawItemPtrs;
             for (auto& [deviceIndex, deviceDrawPacketBuilder] : m_deviceDrawPacketBuilders)
             {
-                deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(0));
+                deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(drawItemIndex));
             }
             m_drawPacketInFlight->m_drawItems.emplace_back(MultiDeviceDrawItem{ m_deviceMask, AZStd::move(deviceDrawItemPtrs) });
         }
@@ -207,12 +208,12 @@ namespace AZ::RHI
         }
 
         // Setup single-device DrawItems
-        for (auto i{ 0 }; i < drawRequestCount; ++i)
+        for (auto drawItemIndex{ 0 }; drawItemIndex < drawRequestCount; ++drawItemIndex)
         {
             AZStd::unordered_map<int, DrawItem*> deviceDrawItemPtrs;
             for (auto& [deviceIndex, deviceDrawPacketBuilder] : m_deviceDrawPacketBuilders)
             {
-                deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(0));
+                deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(drawItemIndex));
             }
             m_drawPacketInFlight->m_drawItems.emplace_back(MultiDeviceDrawItem{ m_deviceMask, AZStd::move(deviceDrawItemPtrs) });
         }
diff --git a/Gems/Atom/RHI/Code/Source/RHI/MultiDeviceRayTracingAccelerationStructure.cpp b/Gems/Atom/RHI/Code/Source/RHI/MultiDeviceRayTracingAccelerationStructure.cpp
@@ -73,8 +73,6 @@ namespace AZ::RHI
 
     RayTracingTlasDescriptor MultiDeviceRayTracingTlasDescriptor::GetDeviceRayTracingTlasDescriptor(int deviceIndex) const
     {
-        AZ_Assert(m_mdInstancesBuffer, "No MultiDeviceBuffer available!\n");
-
         RayTracingTlasDescriptor descriptor;
 
         for (const auto& instance : m_mdInstances)
@@ -237,16 +235,19 @@ namespace AZ::RHI
 
         MultiDeviceObject::Init(deviceMask);
 
-        ResultCode resultCode = IterateObjects<RayTracingTlas>(
-            [this, &descriptor, &rayTracingBufferPools](int deviceIndex, auto deviceRayTracingTlas)
+        ResultCode resultCode{ResultCode::Success};
+        IterateDevices(
+            [this, &descriptor, &rayTracingBufferPools, &resultCode](int deviceIndex)
             {
                 auto device = RHISystemInterface::Get()->GetDevice(deviceIndex);
-                this->m_deviceObjects[deviceIndex] = Factory::Get().CreateRayTracingTlas();
+                auto deviceRayTracingTlas{Factory::Get().CreateRayTracingTlas()};
+                this->m_deviceObjects[deviceIndex] = deviceRayTracingTlas;
 
                 auto deviceDescriptor{ descriptor->GetDeviceRayTracingTlasDescriptor(deviceIndex) };
 
-                return deviceRayTracingTlas->CreateBuffers(
+                resultCode = deviceRayTracingTlas->CreateBuffers(
                     *device, &deviceDescriptor, *rayTracingBufferPools.GetDeviceRayTracingBufferPools(deviceIndex).get());
+                return resultCode == ResultCode::Success;
             });
 
         if (resultCode != ResultCode::Success)
@@ -277,11 +278,11 @@ namespace AZ::RHI
                 if (!tlasBuffer->m_deviceObjects[deviceIndex])
                 {
                     tlasBuffer = nullptr;
-                    return false;
+                    return ResultCode::Fail;
                 }
 
                 tlasBuffer->SetDescriptor(tlasBuffer->GetDeviceBuffer(deviceIndex)->GetDescriptor());
-                return true;
+                return ResultCode::Success;
             });
 
         return tlasBuffer;
diff --git a/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp b/Gems/Atom/RPI/Code/Source/RPI.Public/DynamicDraw/DynamicDrawContext.cpp
@@ -546,7 +546,7 @@ namespace AZ
             drawItem.m_stencilRef = m_stencilRef;
 
             drawItemInfo.m_sortKey = m_sortKey++;
-            m_cachedDrawItems.emplace_back(drawItemInfo);
+            m_cachedDrawItems.emplace_back(AZStd::move(drawItemInfo));
         }
 
         void DynamicDrawContext::DrawLinear(const void* vertexData, uint32_t vertexCount, Data::Instance<ShaderResourceGroup> drawSrg)
@@ -632,7 +632,7 @@ namespace AZ
             }
 
             drawItemInfo.m_sortKey = m_sortKey++;
-            m_cachedDrawItems.emplace_back(drawItemInfo);
+            m_cachedDrawItems.emplace_back(AZStd::move(drawItemInfo));
         }
 
         Data::Instance<ShaderResourceGroup> DynamicDrawContext::NewDrawSrg()

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,8 @@`
`16`	`16`
`17`	`17`	`namespace AZ::RHI`
`18`	`18`	`{`
`19`		`- DrawPacketBuilder::DrawRequest MultiDeviceDrawPacketBuilder::MultiDeviceDrawRequest::BuildDeviceDrawRequest(int deviceIndex)`
	`19`	`+ DrawPacketBuilder::DrawRequest MultiDeviceDrawPacketBuilder::MultiDeviceDrawRequest::`
	`20`	`+ GetDeviceDrawRequest(int deviceIndex)`
`20`	`21`	`{`
`21`	`22`	`if (!m_deviceStreamBufferViews.contains(deviceIndex))`
`22`	`23`	`{`
`@@ -28,14 +29,14 @@ namespace AZ::RHI`
`28`	`29`	`}`
`29`	`30`	`m_deviceStreamBufferViews.emplace(deviceIndex, AZStd::move(deviceStreamBufferView));`
`30`	`31`	`}`
`31`		`-`
`32`		`- return { m_listTag,`
`33`		`- m_stencilRef,`
`34`		`- m_deviceStreamBufferViews.at(deviceIndex),`
`35`		`- m_uniqueShaderResourceGroup ? m_uniqueShaderResourceGroup->GetDeviceShaderResourceGroup(deviceIndex).get() : nullptr,`
`36`		`- m_pipelineState ? m_pipelineState->GetDevicePipelineState(deviceIndex).get() : nullptr,`
`37`		`- m_sortKey,`
`38`		`- m_drawFilterMask };`
	`32`	`+ return DrawPacketBuilder::DrawRequest{`
	`33`	`+ m_listTag,`
	`34`	`+ m_stencilRef,`
	`35`	`+ m_deviceStreamBufferViews.at(deviceIndex),`
	`36`	`+ m_uniqueShaderResourceGroup ? m_uniqueShaderResourceGroup->GetDeviceShaderResourceGroup(deviceIndex).get() : nullptr,`
	`37`	`+ m_pipelineState ? m_pipelineState->GetDevicePipelineState(deviceIndex).get() : nullptr,`
	`38`	`+ m_sortKey,`
	`39`	`+ m_drawFilterMask };`
`39`	`40`	`}`
`40`	`41`
`41`	`42`	`void MultiDeviceDrawPacketBuilder::Begin(IAllocator* allocator)`
`@@ -122,7 +123,7 @@ namespace AZ::RHI`
`122`	`123`	`m_drawPacketInFlight->m_drawListMask.set(request.m_listTag.GetIndex());`
`123`	`124`	`for (auto& [deviceIndex, deviceDrawPacketBuilder] : m_deviceDrawPacketBuilders)`
`124`	`125`	`{`
`125`		`- deviceDrawPacketBuilder.AddDrawItem(request.BuildDeviceDrawRequest(deviceIndex));`
	`126`	`+ deviceDrawPacketBuilder.AddDrawItem(m_drawRequests.back().GetDeviceDrawRequest(deviceIndex));`
`126`	`127`	`}`
`127`	`128`	`}`
`128`	`129`	`else`
`@@ -149,12 +150,12 @@ namespace AZ::RHI`
`149`	`150`	`m_drawPacketInFlight->m_drawItems.reserve(m_drawRequests.size());`
`150`	`151`
`151`	`152`	`// Setup single-device DrawItems`
`152`		`- for (auto i{ 0 }; i < m_drawRequests.size(); ++i)`
	`153`	`+ for (auto drawItemIndex{ 0 }; drawItemIndex < m_drawRequests.size(); ++drawItemIndex)`
`153`	`154`	`{`
`154`	`155`	`AZStd::unordered_map<int, DrawItem*> deviceDrawItemPtrs;`
`155`	`156`	`for (auto& [deviceIndex, deviceDrawPacketBuilder] : m_deviceDrawPacketBuilders)`
`156`	`157`	`{`
`157`		`- deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(0));`
	`158`	`+ deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(drawItemIndex));`
`158`	`159`	`}`
`159`	`160`	`m_drawPacketInFlight->m_drawItems.emplace_back(MultiDeviceDrawItem{ m_deviceMask, AZStd::move(deviceDrawItemPtrs) });`
`160`	`161`	`}`
`@@ -207,12 +208,12 @@ namespace AZ::RHI`
`207`	`208`	`}`
`208`	`209`
`209`	`210`	`// Setup single-device DrawItems`
`210`		`- for (auto i{ 0 }; i < drawRequestCount; ++i)`
	`211`	`+ for (auto drawItemIndex{ 0 }; drawItemIndex < drawRequestCount; ++drawItemIndex)`
`211`	`212`	`{`
`212`	`213`	`AZStd::unordered_map<int, DrawItem*> deviceDrawItemPtrs;`
`213`	`214`	`for (auto& [deviceIndex, deviceDrawPacketBuilder] : m_deviceDrawPacketBuilders)`
`214`	`215`	`{`
`215`		`- deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(0));`
	`216`	`+ deviceDrawItemPtrs.emplace(deviceIndex, m_drawPacketInFlight->m_deviceDrawPackets[deviceIndex]->GetDrawItem(drawItemIndex));`
`216`	`217`	`}`
`217`	`218`	`m_drawPacketInFlight->m_drawItems.emplace_back(MultiDeviceDrawItem{ m_deviceMask, AZStd::move(deviceDrawItemPtrs) });`
`218`	`219`	`}`
Original file line number	Diff line number	Diff line change
`@@ -546,7 +546,7 @@ namespace AZ`
`546`	`546`	`drawItem.m_stencilRef = m_stencilRef;`
`547`	`547`
`548`	`548`	`drawItemInfo.m_sortKey = m_sortKey++;`
`549`		`- m_cachedDrawItems.emplace_back(drawItemInfo);`
	`549`	`+ m_cachedDrawItems.emplace_back(AZStd::move(drawItemInfo));`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`void DynamicDrawContext::DrawLinear(const void* vertexData, uint32_t vertexCount, Data::Instance<ShaderResourceGroup> drawSrg)`
`@@ -632,7 +632,7 @@ namespace AZ`
`632`	`632`	`}`
`633`	`633`
`634`	`634`	`drawItemInfo.m_sortKey = m_sortKey++;`
`635`		`- m_cachedDrawItems.emplace_back(drawItemInfo);`
	`635`	`+ m_cachedDrawItems.emplace_back(AZStd::move(drawItemInfo));`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`Data::Instance<ShaderResourceGroup> DynamicDrawContext::NewDrawSrg()`