DX12: Fixed indirect indexed draw (o3de#16228)

Signed-off-by: Martin Sattlecker <[email protected]>
chilltk · Jun 23, 2023 · c513771 · c513771
1 parent e6f2547
commit c513771
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp b/Gems/Atom/RHI/DX12/Code/Source/RHI/CommandList.cpp
@@ -501,7 +501,14 @@ namespace AZ
 
             case RHI::DrawType::Indirect:
             {
-                ExecuteIndirect(drawItem.m_arguments.m_indirect);
+                const auto& indirect = drawItem.m_arguments.m_indirect;
+                const RHI::IndirectBufferLayout& layout = indirect.m_indirectBufferView->GetSignature()->GetDescriptor().m_layout;
+                if (layout.GetType() == RHI::IndirectBufferLayoutType::IndexedDraw)
+                {
+                    AZ_Assert(drawItem.m_indexBufferView, "Index buffer view is null!");
+                    SetIndexBuffer(*drawItem.m_indexBufferView);
+                }
+                ExecuteIndirect(indirect);
                 break;
             }
             default: