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

1 files changed, 14 insertions, 15 deletions

diff --git a/tools/gfx/immediate-renderer-base.cpp b/tools/gfx/immediate-renderer-base.cpp
index aadc9c1dd..912e20df1 100644
--- a/tools/gfx/immediate-renderer-base.cpp
+++ b/tools/gfx/immediate-renderer-base.cpp
@@ -119,10 +119,9 @@ public:
             uint32_t startSlot,
             uint32_t slotCount,
             IBufferResource* const* buffers,
-            const uint32_t* strides,
             const uint32_t* offsets) override
         {
-            m_writer->setVertexBuffers(startSlot, slotCount, buffers, strides, offsets);
+            m_writer->setVertexBuffers(startSlot, slotCount, buffers, offsets);
         }
 
         virtual SLANG_NO_THROW void SLANG_MCALL
@@ -202,11 +201,8 @@ public:
             uint32_t startVertex,
             uint32_t startInstanceLocation) override
         {
-            SLANG_UNUSED(vertexCount);
-            SLANG_UNUSED(instanceCount);
-            SLANG_UNUSED(startVertex);
-            SLANG_UNUSED(startInstanceLocation);
-            SLANG_UNIMPLEMENTED_X("drawInstanced");
+            m_writer->bindRootShaderObject(m_commandBuffer->m_rootShaderObject);
+            m_writer->drawInstanced(vertexCount, instanceCount, startVertex, startInstanceLocation);
         }
 
         virtual SLANG_NO_THROW void SLANG_MCALL drawIndexedInstanced(
@@ -216,12 +212,8 @@ public:
             int32_t baseVertexLocation,
             uint32_t startInstanceLocation) override
         {
-            SLANG_UNUSED(indexCount);
-            SLANG_UNUSED(instanceCount);
-            SLANG_UNUSED(startIndexLocation);
-            SLANG_UNUSED(baseVertexLocation);
-            SLANG_UNUSED(startInstanceLocation);
-            SLANG_UNIMPLEMENTED_X("drawIndexedInstanced");
+            m_writer->bindRootShaderObject(m_commandBuffer->m_rootShaderObject);
+            m_writer->drawIndexedInstanced(indexCount, instanceCount, startIndexLocation, baseVertexLocation, startInstanceLocation);
         }
     };
 
@@ -500,8 +492,7 @@ public:
                         cmd.operands[0],
                         cmd.operands[1],
                         bufferResources.getArrayView().getBuffer(),
-                        m_writer.getData<uint32_t>(cmd.operands[3]),
-                        m_writer.getData<uint32_t>(cmd.operands[4]));
+                        m_writer.getData<uint32_t>(cmd.operands[3]));
                 }
                 break;
             case CommandName::SetIndexBuffer:
@@ -517,6 +508,14 @@ public:
                 m_renderer->drawIndexed(
                     cmd.operands[0], cmd.operands[1], cmd.operands[2]);
                 break;
+            case CommandName::DrawInstanced:
+                m_renderer->drawInstanced(
+                    cmd.operands[0], cmd.operands[1], cmd.operands[2], cmd.operands[3]);
+                break;
+            case CommandName::DrawIndexedInstanced:
+                m_renderer->drawIndexedInstanced(
+                    cmd.operands[0], cmd.operands[1], cmd.operands[2], cmd.operands[3], cmd.operands[4]);
+                break;
             case CommandName::SetStencilReference:
                 m_renderer->setStencilReference(cmd.operands[0]);
                 break;