igl | Introduce new param 'attributeStride' for RenderCommandEncoder::bindVertexBuffer() (#423)

Summary: Pull Request resolved: #423

Reviewed By: rudybear

Differential Revision: D114761433

Pulled By: corporateshark

fbshipit-source-id: e6b85c74ad3e4d0ddaa6b7788c7e74b7d6b58460

Author: vinsentli

src/igl/RenderCommandEncoder.h

@@ -61,7 +61,10 @@ class IRenderCommandEncoder : public ICommandEncoder {
   // On Vulkan and OpenGL: bind a vertex buffer (as in "a buffer with vertices").
   // On Metal: bind any buffer to the vertex stage. Apps should take care there are no 'index'
   // collisions between bindVertexBuffer() and bindBuffer()
-  virtual void bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset = 0) = 0;
+  virtual void bindVertexBuffer(uint32_t index,
+                                IBuffer& buffer,
+                                size_t bufferOffset = 0,
+                                size_t attributeStride = 0) = 0;
   virtual void bindIndexBuffer(IBuffer& buffer, IndexFormat format, size_t bufferOffset = 0) = 0;
   /// Creates and binds a temporary buffer to the specified buffer index.
   virtual void bindBytes(size_t index, uint8_t target, const void* data, size_t length) = 0;

src/igl/d3d12/RenderCommandEncoder.cpp

@@ -827,7 +827,10 @@ void RenderCommandEncoder::bindRenderPipelineState(
 void RenderCommandEncoder::bindDepthStencilState(
     const std::shared_ptr<IDepthStencilState>& /*depthStencilState*/) {}
 
-void RenderCommandEncoder::bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) {
+void RenderCommandEncoder::bindVertexBuffer(uint32_t index,
+                                            IBuffer& buffer,
+                                            size_t bufferOffset,
+                                            size_t /*attributeStride*/) {
   IGL_D3D12_LOG_VERBOSE("bindVertexBuffer called: index=%u\n", index);
   if (index >= IGL_BUFFER_BINDINGS_MAX) {
     IGL_LOG_ERROR("bindVertexBuffer: index %u exceeds max %u\n", index, IGL_BUFFER_BINDINGS_MAX);

src/igl/d3d12/RenderCommandEncoder.h

@@ -60,7 +60,10 @@ class RenderCommandEncoder final : public IRenderCommandEncoder {
   void bindRenderPipelineState(const std::shared_ptr<IRenderPipelineState>& pipelineState) override;
   void bindDepthStencilState(const std::shared_ptr<IDepthStencilState>& depthStencilState) override;
 
-  void bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset = 0) override;
+  void bindVertexBuffer(uint32_t index,
+                        IBuffer& buffer,
+                        size_t bufferOffset,
+                        size_t attributeStride) override;
   void bindIndexBuffer(IBuffer& buffer, IndexFormat format, size_t bufferOffset = 0) override;
 
   void bindBytes(size_t index, uint8_t target, const void* data, size_t length) override;

src/igl/metal/RenderCommandEncoder.h

@@ -45,7 +45,10 @@ class RenderCommandEncoder final : public IRenderCommandEncoder {
                   size_t bufferOffset,
                   size_t bufferSize) override;
   void bindBuffer(uint32_t index, IBuffer* buffer, size_t bufferOffset, size_t bufferSize) override;
-  void bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) override;
+  void bindVertexBuffer(uint32_t index,
+                        IBuffer& buffer,
+                        size_t bufferOffset,
+                        size_t attributeStride) override;
   void bindIndexBuffer(IBuffer& buffer, IndexFormat format, size_t bufferOffset) override;
   void bindBytes(size_t index, uint8_t bindTarget, const void* data, size_t length) override;
   void bindPushConstants(const void* data, size_t length, size_t offset) override;

src/igl/metal/RenderCommandEncoder.mm

@@ -372,7 +372,10 @@
   }
 }
 
-void RenderCommandEncoder::bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) {
+void RenderCommandEncoder::bindVertexBuffer(uint32_t index,
+                                            IBuffer& buffer,
+                                            size_t bufferOffset,
+                                            size_t attributeStride) {
   IGL_DEBUG_ASSERT(encoder_);
   IGL_DEBUG_ASSERT(index < IGL_BUFFER_BINDINGS_MAX);
 

src/igl/opengl/RenderCommandEncoder.cpp

@@ -413,7 +413,10 @@ void RenderCommandEncoder::bindBuffer(uint32_t index,
   }
 }
 
-void RenderCommandEncoder::bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) {
+void RenderCommandEncoder::bindVertexBuffer(uint32_t index,
+                                            IBuffer& buffer,
+                                            size_t bufferOffset,
+                                            size_t attributeStride) {
   IGL_PROFILER_FUNCTION();
   if (IGL_DEBUG_VERIFY(adapter_)) {
     Buffer& glBuffer = static_cast<Buffer&>(buffer);

src/igl/opengl/RenderCommandEncoder.h

@@ -63,7 +63,10 @@ class RenderCommandEncoder final : public IRenderCommandEncoder, public WithCont
                   size_t bufferOffset,
                   size_t bufferSize) override;
   void bindBuffer(uint32_t index, IBuffer* buffer, size_t bufferOffset, size_t bufferSize) override;
-  void bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) override;
+  void bindVertexBuffer(uint32_t index,
+                        IBuffer& buffer,
+                        size_t bufferOffset,
+                        size_t attributeStride) override;
   void bindIndexBuffer(IBuffer& buffer, IndexFormat format, size_t bufferOffset) override;
   void bindBytes(size_t index, uint8_t target, const void* data, size_t length) override;
   void bindPushConstants(const void* data, size_t length, size_t offset) override;

src/igl/vulkan/RenderCommandEncoder.cpp

@@ -512,7 +512,10 @@ void RenderCommandEncoder::bindBuffer(uint32_t index,
   binder_.bindBuffer(index, buf, bufferOffset, bufferSize);
 }
 
-void RenderCommandEncoder::bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) {
+void RenderCommandEncoder::bindVertexBuffer(uint32_t index,
+                                            IBuffer& buffer,
+                                            size_t bufferOffset,
+                                            size_t attributeStride) {
   IGL_PROFILER_FUNCTION();
   IGL_PROFILER_ZONE_GPU_VK("bindVertexBuffer()", ctx_.tracyCtx_, cmdBuffer_);
 

src/igl/vulkan/RenderCommandEncoder.h

@@ -64,7 +64,10 @@ class RenderCommandEncoder : public IRenderCommandEncoder {
                   size_t bufferOffset,
                   size_t bufferSize) override;
   void bindBuffer(uint32_t index, IBuffer* buffer, size_t bufferOffset, size_t bufferSize) override;
-  void bindVertexBuffer(uint32_t index, IBuffer& buffer, size_t bufferOffset) override;
+  void bindVertexBuffer(uint32_t index,
+                        IBuffer& buffer,
+                        size_t bufferOffset,
+                        size_t attributeStride) override;
   void bindIndexBuffer(IBuffer& buffer, IndexFormat format, size_t bufferOffset) override;
 
   /// @brief Not implemented