From aee4aa3528072e4b5e95ccc4e571868716b47d50 Mon Sep 17 00:00:00 2001
From: lucy96chen <47800040+lucy96chen@users.noreply.github.com>
Date: Mon, 10 Jan 2022 11:00:50 -0800
Subject: Draw call tests for Vulkan (#2073)

* Added instancing support to Vulkan, drawInstanced() test image is upside-down

* Fixed inverted drawInstanced() test output by changing Vulkan viewport convention

* Replaced vkCmdDraw with vkCmdDrawIndexed in all non-indirect indexed draws, drawIndexedIndirect test now working for Vulkan

* Moved index and vertex buffer binding into setIndexBuffer and setVertexBuffers; Defaulted countBuffer to nullptr and countOffset to 0 and added a check for non-null countBuffer to drawIndirect and drawIndexedIndirect in Vulkan; All Vulkan draw tests working (but D3D12 tests broken)

* Added support for drawInstanced and drawIndexedInstanced to D3D11 and added tests for both, however D3D11 tests are currently disabled due to readTextureResource assuming a fixed pixel size (among other possible problems); Fixed issues causing D3D12 tests to fail after major back-end fixes to get Vulkan up and running

* Removed testing function for dumping images and some other commented out code

* Removed some commented out code

* Fix initializer list causing builds to fail (attempt 1)

* Removed initializer list for VertexStreamDesc in createInputLayout() and fill in struct fields normally (build fix attempt 2)

* Removed default values from VertexStreamDesc and changed all initializer lists to reflect this change

* Moved applyBinding before setVertexBuffer in RenderTestApp::renderFrame() to ensure the pipeline has already been bound before vertex buffers are

* Changed D3D11's readTextureResource to calculate pixel size using format-specific size information; Removed wrapper around D3D11 instanced and indexed instanced draw tests
---
 tools/gfx/command-writer.h | 35 ++++++++++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

(limited to 'tools/gfx/command-writer.h')

diff --git a/tools/gfx/command-writer.h b/tools/gfx/command-writer.h
index 208cb185a..dc793a3e5 100644
--- a/tools/gfx/command-writer.h
+++ b/tools/gfx/command-writer.h
@@ -21,6 +21,8 @@ enum class CommandName
     SetIndexBuffer,
     Draw,
     DrawIndexed,
+    DrawInstanced,
+    DrawIndexedInstanced,
     SetStencilReference,
     DispatchCompute,
     UploadBufferData,
@@ -198,7 +200,6 @@ public:
         uint32_t startSlot,
         uint32_t slotCount,
         IBufferResource* const* buffers,
-        const uint32_t* strides,
         const uint32_t* offsets)
     {
         uint32_t bufferOffset = 0;
@@ -208,14 +209,12 @@ public:
             if (i == 0)
                 bufferOffset = offset;
         }
-        uint32_t stridesOffset = encodeData(strides, sizeof(uint32_t) * slotCount);
         uint32_t offsetsOffset = encodeData(offsets, sizeof(uint32_t) * slotCount);
         m_commands.add(Command(
             CommandName::SetVertexBuffers,
             startSlot,
             slotCount,
             bufferOffset,
-            stridesOffset,
             offsetsOffset));
     }
 
@@ -240,6 +239,36 @@ public:
             (uint32_t)baseVertex));
     }
 
+    void drawInstanced(
+        uint32_t vertexCount,
+        uint32_t instanceCount,
+        uint32_t startVertex,
+        uint32_t startInstanceLocation)
+    {
+        m_commands.add(Command(
+            CommandName::DrawInstanced,
+            (uint32_t)vertexCount,
+            (uint32_t)instanceCount,
+            (uint32_t)startVertex,
+            (uint32_t)startInstanceLocation));
+    }
+
+    void drawIndexedInstanced(
+        uint32_t indexCount,
+        uint32_t instanceCount,
+        uint32_t startIndexLocation,
+        int32_t baseVertexLocation,
+        uint32_t startInstanceLocation)
+    {
+        m_commands.add(Command(
+            CommandName::DrawIndexedInstanced,
+            (uint32_t)indexCount,
+            (uint32_t)instanceCount,
+            (uint32_t)startIndexLocation,
+            (int32_t)baseVertexLocation,
+            (uint32_t)startInstanceLocation));
+    }
+
     void setStencilReference(uint32_t referenceValue)
     {
         m_commands.add(Command(CommandName::SetStencilReference, referenceValue));
-- 
cgit v1.2.3