createVertexBuffer in api-agnostic device

Author: EmilioLaiso

include/API/Device.h

@@ -19,6 +19,7 @@
 #include "API/Capabilities.h"
 #include "API/CommandBuffer.h"
 #include "API/Texture.h"
+#include "API/VertexBuffer.h"
 #include "Support/Pipeline.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/ADT/iterator_range.h"
@@ -118,6 +119,10 @@ createRenderTargetFromCPUBuffer(Device &Dev, const CPUBuffer &Buf);
 llvm::Expected<std::shared_ptr<Texture>>
 createDefaultDepthStencilTarget(Device &Dev, uint32_t Width, uint32_t Height);
 
+// Creates a VertexBuffer from a ParsedVertexBuffer.
+llvm::Expected<VertexBuffer>
+createVertexBuffer(Device &Dev, const ParsedVertexBuffer &PVB);
+
 } // namespace offloadtest
 
 #endif // OFFLOADTEST_API_DEVICE_H

include/API/VertexBuffer.h

@@ -32,7 +32,6 @@ struct VertexStream {
 struct VertexBufferDesc {
   llvm::SmallVector<VertexStream> Streams;
 
-  // Returns the stride in bytes (sum of all stream format sizes).
   uint32_t getStride() const {
     uint32_t Stride = 0;
     for (const auto &S : Streams)

include/Support/Pipeline.h

@@ -351,7 +351,7 @@ struct RuntimeSettings {
 struct VertexStreamData {
   std::string Name; // Semantic name (e.g. POSITION, COLOR).
   Format Fmt;
-  llvm::SmallVector<double> Values; // One value per component.
+  llvm::SmallVector<double> Values;
 };
 
 // Parsed vertex buffer from the YAML VertexBuffers section. The parser

lib/API/DX/Device.cpp

@@ -1613,19 +1613,10 @@ class DXDevice : public offloadtest::Device {
           "No vertex buffer bound for graphics pipeline.");
 
     const ParsedVertexBuffer &PVB = *P.Bindings.VertexBufferPtr;
-
-    BufferCreateDesc BufDesc = {};
-    BufDesc.Location = MemoryLocation::CpuToGpu;
-    BufDesc.Usage = BufferUsage::VertexBuffer;
-    auto BufOrErr = createBuffer("VertexBuffer", BufDesc, PVB.InterleavedSize);
-    if (!BufOrErr)
-      return BufOrErr.takeError();
-
-    VertexBufferDesc VBDesc;
-    for (const auto &S : PVB.Streams)
-      VBDesc.Streams.push_back({S.Name, S.Fmt});
-
-    IS.VB = offloadtest::VertexBuffer{VBDesc, *BufOrErr};
+    auto VBOrErr = offloadtest::createVertexBuffer(*this, PVB);
+    if (!VBOrErr)
+      return VBOrErr.takeError();
+    IS.VB = std::move(*VBOrErr);
 
     // TODO: Currently uses a single CpuToGpu mapped buffer. For optimal GPU
     // performance on discrete GPUs, use a staging buffer + copy to a GpuOnly

lib/API/Device.cpp

@@ -11,6 +11,7 @@
 
 #include "API/Device.h"
 #include "API/FormatConversion.h"
+#include "API/VertexBuffer.h"
 
 #include "Config.h"
 
@@ -79,6 +80,26 @@ offloadtest::createRenderTargetFromCPUBuffer(Device &Dev,
   return Dev.createTexture("RenderTarget", Desc);
 }
 
+llvm::Expected<VertexBuffer>
+offloadtest::createVertexBuffer(Device &Dev, const ParsedVertexBuffer &PVB) {
+  BufferCreateDesc BufDesc = {};
+  BufDesc.Location = MemoryLocation::CpuToGpu;
+  BufDesc.Usage = BufferUsage::VertexBuffer;
+  auto BufOrErr =
+      Dev.createBuffer("VertexBuffer", BufDesc, PVB.InterleavedSize);
+  if (!BufOrErr)
+    return BufOrErr.takeError();
+
+  VertexBufferDesc VBDesc;
+  for (const auto &S : PVB.Streams)
+    VBDesc.Streams.push_back({S.Name, S.Fmt});
+
+  // TODO: Generalize VB data copy so that we can deduplicate that from each
+  // backend.
+
+  return VertexBuffer{VBDesc, *BufOrErr};
+}
+
 llvm::Expected<std::shared_ptr<Texture>>
 offloadtest::createDefaultDepthStencilTarget(Device &Dev, uint32_t Width,
                                              uint32_t Height) {

lib/API/MTL/MTLDevice.cpp

@@ -448,20 +448,10 @@ class MTLDevice : public offloadtest::Device {
             "No vertex buffer specified for graphics pipeline.");
 
       const ParsedVertexBuffer &PVB = *P.Bindings.VertexBufferPtr;
-
-      BufferCreateDesc BufDesc = {};
-      BufDesc.Location = MemoryLocation::CpuToGpu;
-      BufDesc.Usage = BufferUsage::VertexBuffer;
-      auto BufOrErr =
-          createBuffer("VertexBuffer", BufDesc, PVB.InterleavedSize);
-      if (!BufOrErr)
-        return BufOrErr.takeError();
-
-      VertexBufferDesc VBDesc;
-      for (const auto &S : PVB.Streams)
-        VBDesc.Streams.push_back({S.Name, S.Fmt});
-
-      IS.VB = offloadtest::VertexBuffer{VBDesc, *BufOrErr};
+      auto VBOrErr = offloadtest::createVertexBuffer(*this, PVB);
+      if (!VBOrErr)
+        return VBOrErr.takeError();
+      IS.VB = std::move(*VBOrErr);
 
       // TODO: Currently uses a single CpuToGpu mapped buffer. On discrete GPUs
       // (DX/VK), consider using a staging buffer + copy to a GpuOnly vertex

lib/API/VK/Device.cpp

@@ -1283,20 +1283,10 @@ class VulkanDevice : public offloadtest::Device {
             "No vertex buffer specified for graphics pipeline.");
 
       const ParsedVertexBuffer &PVB = *P.Bindings.VertexBufferPtr;
-
-      BufferCreateDesc VBBufDesc = {};
-      VBBufDesc.Location = MemoryLocation::CpuToGpu;
-      VBBufDesc.Usage = BufferUsage::VertexBuffer;
-      auto BufOrErr =
-          createBuffer("VertexBuffer", VBBufDesc, PVB.InterleavedSize);
-      if (!BufOrErr)
-        return BufOrErr.takeError();
-
-      VertexBufferDesc VBDesc;
-      for (const auto &S : PVB.Streams)
-        VBDesc.Streams.push_back({S.Name, S.Fmt});
-
-      IS.VB = offloadtest::VertexBuffer{VBDesc, *BufOrErr};
+      auto VBOrErr = offloadtest::createVertexBuffer(*this, PVB);
+      if (!VBOrErr)
+        return VBOrErr.takeError();
+      IS.VB = std::move(*VBOrErr);
 
       // TODO: Currently uses a single CpuToGpu mapped buffer. For optimal GPU
       // performance on discrete GPUs, use a staging buffer + copy to a GpuOnly