Merge branch 'development' of https://github.com/o3de/o3de into daimini/SliceLevelUiRedCode/SliceLayers

Signed-off-by: Danilo Aimini <[email protected]>

Author: AMZN-daimini

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.cpp

@@ -18,6 +18,7 @@
 #include <AzToolsFramework/Entity/EditorEntityContextBus.h>
 #include <AzToolsFramework/Entity/EditorEntityHelpers.h>
 #include <AzToolsFramework/Entity/EditorEntityInfoBus.h>
+#include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
 #include <AzToolsFramework/Entity/PrefabEditorEntityOwnershipInterface.h>
 #include <AzToolsFramework/Entity/ReadOnly/ReadOnlyEntityInterface.h>
 #include <AzToolsFramework/Prefab/EditorPrefabComponent.h>
@@ -36,14 +37,23 @@
 #include <AzToolsFramework/Prefab/Undo/PrefabUndoUpdateLink.h>
 #include <AzToolsFramework/Prefab/PrefabUndoHelpers.h>
 #include <AzToolsFramework/ToolsComponents/TransformComponent.h>
-#include <AzToolsFramework/Entity/EditorEntitySortComponent.h>
+#include <AzToolsFramework/ViewportSelection/EditorTransformComponentSelectionRequestBus.h>
 
 #include <QString>
+#include <QTimer>
 
 namespace AzToolsFramework
 {
     namespace Prefab
     {
+        PrefabPublicHandler::PrefabPublicHandler()
+        {
+            // Detect whether this is being run in the Editor or during a Unit Test.
+            AZ::ApplicationTypeQuery appType;
+            AZ::ComponentApplicationBus::Broadcast(&AZ::ComponentApplicationBus::Events::QueryApplicationType, appType);
+            m_isRunningInEditor = (!appType.IsValid() || appType.IsEditor());
+        }
+
         void PrefabPublicHandler::RegisterPrefabPublicHandlerInterface()
         {
             m_prefabFocusHandler.RegisterPrefabFocusInterface();
@@ -1340,8 +1350,25 @@ namespace AzToolsFramework
                 // Select the duplicated entities/instances
                 auto selectionUndo = aznew SelectionCommand(duplicatedEntityAndInstanceIds, "Select Duplicated Entities/Instances");
                 selectionUndo->SetParent(undoBatch.GetUndoBatch());
-                ToolsApplicationRequestBus::Broadcast(
-                    &ToolsApplicationRequestBus::Events::SetSelectedEntities, duplicatedEntityAndInstanceIds);
+
+                // Only delay selection in the Editor to ensure the manipulators in the viewport are refreshed correctly.
+                if (m_isRunningInEditor)
+                {
+                    QTimer::singleShot(
+                        0,
+                        [duplicatedEntityAndInstanceIds]()
+                        {
+                            ToolsApplicationRequestBus::Broadcast(
+                                &ToolsApplicationRequestBus::Events::SetSelectedEntities, duplicatedEntityAndInstanceIds);
+                        }
+                    );
+                }
+                else
+                {
+                    ToolsApplicationRequestBus::Broadcast(
+                        &ToolsApplicationRequestBus::Events::SetSelectedEntities, duplicatedEntityAndInstanceIds);
+                }
+
             }
 
             return AZ::Success(AZStd::move(duplicatedEntityAndInstanceIds));

Code/Framework/AzToolsFramework/AzToolsFramework/Prefab/PrefabPublicHandler.h

@@ -39,6 +39,8 @@ namespace AzToolsFramework
             AZ_CLASS_ALLOCATOR(PrefabPublicHandler, AZ::SystemAllocator);
             AZ_RTTI(PrefabPublicHandler, "{35802943-6B60-430F-9DED-075E3A576A25}", PrefabPublicInterface);
 
+            PrefabPublicHandler();
+
             void RegisterPrefabPublicHandlerInterface();
             void UnregisterPrefabPublicHandlerInterface();
 
@@ -212,6 +214,8 @@ namespace AzToolsFramework
             PrefabFocusHandler m_prefabFocusHandler;
 
             uint64_t m_newEntityCounter = 1;
+
+            bool m_isRunningInEditor = true;
         };
     } // namespace Prefab
 } // namespace AzToolsFramework

Gems/Atom/RHI/Code/Include/Atom/RHI/IndirectArguments.h

@@ -20,7 +20,7 @@ namespace AZ::RHI
 
         IndirectArgumentsTemplate(
             uint32_t maxSequenceCount,
-            const IndirectBufferView& indirectBuffer,
+            const IndirectBufferViewClass& indirectBuffer,
             uint64_t indirectBufferByteOffset)
             : IndirectArgumentsTemplate(
                 maxSequenceCount,
@@ -32,9 +32,9 @@ namespace AZ::RHI
 
         IndirectArgumentsTemplate(
             uint32_t maxSequenceCount,
-            const IndirectBufferView& indirectBuffer,
+            const IndirectBufferViewClass& indirectBuffer,
             uint64_t indirectBufferByteOffset,
-            const Buffer* countBuffer,
+            const BufferClass* countBuffer,
             uint64_t countBufferByteOffset)
             : m_maxSequenceCount(maxSequenceCount)
             , m_indirectBufferView(&indirectBuffer)

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceBufferPool.h

@@ -20,7 +20,7 @@ namespace AZ::RHI
     struct MultiDeviceBufferMapResponse
     {
         //! Will hold the mapped data for each device selected in the MultiDeviceBuffer
-        AZStd::vector<void*> m_data;
+        AZStd::unordered_map<int, void*> m_data;
     };
 
     using MultiDeviceBufferInitRequest = BufferInitRequestTemplate<MultiDeviceBuffer>;

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceDispatchItem.h

@@ -53,7 +53,7 @@ namespace AZ::RHI
             case DispatchType::Direct:
                 return DispatchArguments(m_direct);
             case DispatchType::Indirect:
-                return DispatchArguments(DispatchIndirect{m_mdIndirect.m_maxSequenceCount, m_mdIndirect.m_indirectBufferView->GetDeviceIndirectBufferView(deviceIndex), m_mdIndirect.m_indirectBufferByteOffset, m_mdIndirect.m_countBuffer->GetDeviceBuffer(deviceIndex).get(), m_mdIndirect.m_countBufferByteOffset});
+                return DispatchArguments(DispatchIndirect{m_mdIndirect.m_maxSequenceCount, m_mdIndirect.m_indirectBufferView->GetDeviceIndirectBufferView(deviceIndex), m_mdIndirect.m_indirectBufferByteOffset, m_mdIndirect.m_countBuffer ? m_mdIndirect.m_countBuffer->GetDeviceBuffer(deviceIndex).get() : nullptr, m_mdIndirect.m_countBufferByteOffset});
             default:
                 return DispatchArguments();
             }

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceIndirectBufferView.h

@@ -32,18 +32,55 @@ namespace AZ::RHI
             uint32_t byteCount,
             uint32_t byteStride);
 
+        //! The mutex stops the default generation
+        MultiDeviceIndirectBufferView(const MultiDeviceIndirectBufferView& other)
+            : m_hash{ other.m_hash }
+            , m_mdBuffer{ other.m_mdBuffer }
+            , m_mdSignature{ other.m_mdSignature }
+            , m_byteOffset{ other.m_byteOffset }
+            , m_byteCount{ other.m_byteCount }
+            , m_byteStride{ other.m_byteStride }
+        {
+        }
+
+        MultiDeviceIndirectBufferView& operator=(const MultiDeviceIndirectBufferView& other)
+        {
+            this->m_hash = other.m_hash;
+            this->m_mdBuffer = other.m_mdBuffer;
+            this->m_mdSignature = other.m_mdSignature;
+            this->m_byteOffset = other.m_byteOffset;
+            this->m_byteCount = other.m_byteCount;
+            this->m_byteStride = other.m_byteStride;
+
+            return *this;
+        }
+
         //! Returns the device-specific IndirectBufferView for the given index
-        IndirectBufferView GetDeviceIndirectBufferView(int deviceIndex) const
+        const IndirectBufferView& GetDeviceIndirectBufferView(int deviceIndex) const
         {
             AZ_Error("MultiDeviceIndirectBufferView", m_mdSignature, "No MultiDeviceIndirectBufferSignature available\n");
             AZ_Error("MultiDeviceIndirectBufferView", m_mdBuffer, "No MultiDeviceBuffer available\n");
 
-            return IndirectBufferView(
-                *m_mdBuffer->GetDeviceBuffer(deviceIndex),
-                *m_mdSignature->GetDeviceIndirectBufferSignature(deviceIndex),
-                m_byteOffset,
-                m_byteCount,
-                m_byteStride);
+            AZStd::lock_guard lock(m_bufferViewMutex);
+            auto iterator{ m_cache.find(deviceIndex) };
+            if (iterator == m_cache.end())
+            {
+                //! Buffer view is not yet in the cache
+                auto [new_iterator, inserted]{ m_cache.insert(AZStd::make_pair(
+                    deviceIndex,
+                    IndirectBufferView(
+                        *m_mdBuffer->GetDeviceBuffer(deviceIndex),
+                        *m_mdSignature->GetDeviceIndirectBufferSignature(deviceIndex),
+                        m_byteOffset,
+                        m_byteCount,
+                        m_byteStride))) };
+                if (inserted)
+                {
+                    return new_iterator->second;
+                }
+            }
+
+            return iterator->second;
         }
 
         //! Returns the hash of the view. This hash is precomputed at creation time.
@@ -72,5 +109,9 @@ namespace AZ::RHI
         uint32_t m_byteOffset = 0;
         uint32_t m_byteCount = 0;
         uint32_t m_byteStride = 0;
+
+        //! Safe-guard access to IndirectBufferView cache during parallel access
+        mutable AZStd::mutex m_bufferViewMutex{};
+        mutable AZStd::unordered_map<int, IndirectBufferView> m_cache;
     };
 } // namespace AZ::RHI

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceShaderResourceGroupData.h

@@ -54,7 +54,7 @@ namespace AZ::RHI
         ShaderInputConstantIndex FindShaderInputConstantIndex(const Name& name) const;
 
         //! Sets one image view for the given shader input index.
-        bool SetImageView(ShaderInputImageIndex inputIndex, const MultiDeviceImageView* imageView, uint32_t arrayIndex);
+        bool SetImageView(ShaderInputImageIndex inputIndex, const MultiDeviceImageView* imageView, uint32_t arrayIndex = 0);
 
         //! Sets an array of image view for the given shader input index.
         bool SetImageViewArray(

Gems/Atom/RHI/Code/Include/Atom/RHI/MultiDeviceSwapChain.h

@@ -40,6 +40,8 @@ namespace AZ::RHI
         //! it is explicitly initialized with just a deviceIndex
         ResultCode Init(int deviceIndex, const SwapChainDescriptor& descriptor);
 
+        Ptr<SwapChain> GetDeviceSwapChain() const;
+
         //! Presents the swap chain to the display, and rotates the images.
         void Present();
 

Gems/Atom/RHI/Code/Source/RHI/MultiDeviceBufferPool.cpp

@@ -230,7 +230,7 @@ namespace AZ::RHI
             }
             else
             {
-                response.m_data.push_back(deviceMapResponse.m_data);
+                response.m_data[deviceIndex] = deviceMapResponse.m_data;
             }
 
             return resultCode;

Gems/Atom/RHI/Code/Source/RHI/MultiDeviceIndirectBufferSignature.cpp

@@ -16,8 +16,6 @@ namespace AZ::RHI
     IndirectBufferSignatureDescriptor MultiDeviceIndirectBufferSignatureDescriptor::GetDeviceIndirectBufferSignatureDescriptor(
         int deviceIndex) const
     {
-        AZ_Assert(m_pipelineState, "No MultiDevicePipelineState available\n");
-
         IndirectBufferSignatureDescriptor descriptor{ m_layout };
 
         if (m_pipelineState)