Add missing bind_index_buffer

Author: floppyhammer

pathfinder/gpu/command_encoder.cpp

@@ -63,6 +63,18 @@ void CommandEncoder::bind_vertex_buffers(std::vector<std::pair<std::shared_ptr<B
     commands_.push_back(cmd);
 }
 
+void CommandEncoder::bind_index_buffer(Buffer *buffer) {
+    Command cmd{};
+    cmd.type = CommandType::BindIndexBuffer;
+
+    auto &args = cmd.args.bind_index_buffer;
+    args.buffer = buffer;
+    args.offset = 0;
+    args.data_type = DataType::u32;
+
+    commands_.push_back(cmd);
+}
+
 void CommandEncoder::bind_descriptor_set(const std::shared_ptr<DescriptorSet> &descriptor_set) {
     Command cmd{};
     cmd.type = CommandType::BindDescriptorSet;
@@ -98,7 +110,7 @@ void CommandEncoder::draw_indexed(uint32_t index_count,
                                   uint32_t instance_count,
                                   uint32_t first_index,
                                   uint32_t first_instance) {
-    Command cmd;
+    Command cmd{};
     cmd.type = CommandType::DrawIndexed;
 
     auto &args = cmd.args.draw_indexed;
@@ -122,7 +134,7 @@ void CommandEncoder::draw_instanced(uint32_t vertex_count, uint32_t instance_cou
 }
 
 void CommandEncoder::draw_indirect(Buffer *buffer, uint32_t offset) {
-    Command cmd;
+    Command cmd{};
     cmd.type = CommandType::DrawIndirect;
 
     auto &args = cmd.args.indirect;
@@ -164,7 +176,7 @@ void CommandEncoder::dispatch(uint32_t group_size_x, uint32_t group_size_y, uint
 }
 
 void CommandEncoder::dispatch_indirect(Buffer *buffer, uint32_t offset) {
-    Command cmd;
+    Command cmd{};
     cmd.type = CommandType::DispatchIndirect;
 
     auto &args = cmd.args.indirect;

pathfinder/gpu/command_encoder.h

@@ -26,6 +26,7 @@ enum class CommandType {
     SetViewport,
     BindRenderPipeline,
     BindVertexBuffers,
+    BindIndexBuffer,
     BindDescriptorSet,
     Draw,
     DrawIndexed,
@@ -73,6 +74,8 @@ struct Command {
         } bind_vertex_buffers;
         struct {
             Buffer *buffer;
+            DataType data_type; // u32 only.
+            size_t offset;      // Zero only.
         } bind_index_buffer;
         struct {
             DescriptorSet *descriptor_set;
@@ -159,6 +162,8 @@ class CommandEncoder {
 
     void bind_vertex_buffers(std::vector<std::pair<std::shared_ptr<Buffer>, uint64_t>> vertex_buffers);
 
+    void bind_index_buffer(Buffer *buffer);
+
     /// Bind uniform buffers and texture samplers.
     /// Image layout should be ready before calling this.
     void bind_descriptor_set(const std::shared_ptr<DescriptorSet> &descriptor_set);

pathfinder/gpu/gl/command_encoder.cpp

@@ -155,6 +155,14 @@ bool CommandEncoderGl::finish() {
 
                 gl_check_error("BindVertexBuffers");
             } break;
+            case CommandType::BindIndexBuffer: {
+                const auto &args = cmd.args.bind_index_buffer;
+
+                auto buffer_gl = (BufferGl *)args.buffer;
+                glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, buffer_gl->get_handle());
+
+                gl_check_error("BindIndexBuffer");
+            } break;
             case CommandType::BindDescriptorSet: {
                 auto &args = cmd.args.bind_descriptor_set;
 

pathfinder/gpu/vk/command_encoder.cpp

@@ -272,6 +272,16 @@ bool CommandEncoderVk::finish() {
                                        vertex_buffers.data(),
                                        offsets.data()); // Data offset of each buffer.
             } break;
+            case CommandType::BindIndexBuffer: {
+                auto &args = cmd.args.bind_index_buffer;
+
+                auto buffer_vk = static_cast<BufferVk *>(args.buffer);
+
+                VkBuffer buffer = buffer_vk->get_vk_buffer();
+                VkDeviceSize offset = args.offset;
+
+                vkCmdBindIndexBuffer(vk_command_buffer_, buffer, offset, VK_INDEX_TYPE_UINT32);
+            } break;
             case CommandType::BindDescriptorSet: {
                 auto &args = cmd.args.bind_descriptor_set;
                 auto descriptor_set_vk = static_cast<DescriptorSetVk *>(args.descriptor_set);