1 files changed, 58 insertions, 0 deletions
diff --git a/src/gpu/vk/GrVkCommandBuffer.cpp b/src/gpu/vk/GrVkCommandBuffer.cpp
index 63642d4ed0..d4fe80caf9 100644
--- a/src/gpu/vk/GrVkCommandBuffer.cpp
+++ b/src/gpu/vk/GrVkCommandBuffer.cpp
@@ -7,14 +7,19 @@
 
 #include "GrVkCommandBuffer.h"
 
+#include "GrVkGpu.h"
 #include "GrVkFramebuffer.h"
+#include "GrVkImage.h"
 #include "GrVkImageView.h"
+#include "GrVkIndexBuffer.h"
 #include "GrVkPipeline.h"
+#include "GrVkPipelineState.h"
 #include "GrVkRenderPass.h"
 #include "GrVkRenderTarget.h"
 #include "GrVkPipelineState.h"
 #include "GrVkTransferBuffer.h"
 #include "GrVkUtil.h"
+#include "GrVkVertexBuffer.h"
 #include "SkRect.h"
 
 void GrVkCommandBuffer::invalidateState() {
@@ -145,6 +150,40 @@ void GrVkCommandBuffer::pipelineBarrier(const GrVkGpu* gpu,
 
 }
 
+void GrVkCommandBuffer::bindInputBuffer(GrVkGpu* gpu, uint32_t binding,
+                                        const GrVkVertexBuffer* vbuffer) {
+    VkBuffer vkBuffer = vbuffer->buffer();
+    SkASSERT(VK_NULL_HANDLE != vkBuffer);
+    SkASSERT(binding < kMaxInputBuffers);
+    // TODO: once vbuffer->offset() no longer always returns 0, we will need to track the offset
+    // to know if we can skip binding or not.
+    if (vkBuffer != fBoundInputBuffers[binding]) {
+        VkDeviceSize offset = vbuffer->offset();
+        GR_VK_CALL(gpu->vkInterface(), CmdBindVertexBuffers(fCmdBuffer,
+                                                            binding,
+                                                            1,
+                                                            &vkBuffer,
+                                                            &offset));
+        fBoundInputBuffers[binding] = vkBuffer;
+        addResource(vbuffer->resource());
+    }
+}
+
+void GrVkCommandBuffer::bindIndexBuffer(GrVkGpu* gpu, const GrVkIndexBuffer* ibuffer) {
+    VkBuffer vkBuffer = ibuffer->buffer();
+    SkASSERT(VK_NULL_HANDLE != vkBuffer);
+    // TODO: once ibuffer->offset() no longer always returns 0, we will need to track the offset
+    // to know if we can skip binding or not.
+    if (vkBuffer != fBoundIndexBuffer) {
+        GR_VK_CALL(gpu->vkInterface(), CmdBindIndexBuffer(fCmdBuffer,
+                                                          vkBuffer,
+                                                          ibuffer->offset(),
+                                                          VK_INDEX_TYPE_UINT16));
+        fBoundIndexBuffer = vkBuffer;
+        addResource(ibuffer->resource());
+    }
+}
+
 void GrVkCommandBuffer::clearAttachments(const GrVkGpu* gpu,
                                          int numAttachments,
                                          const VkClearAttachment* attachments,
@@ -535,6 +574,25 @@ void GrVkPrimaryCommandBuffer::blitImage(const GrVkGpu* gpu,
                                                 filter));
 }
 
+void GrVkPrimaryCommandBuffer::blitImage(const GrVkGpu* gpu,
+                                         const GrVkImage& srcImage,
+                                         const GrVkImage& dstImage,
+                                         uint32_t blitRegionCount,
+                                         const VkImageBlit* blitRegions,
+                                         VkFilter filter) {
+    this->blitImage(gpu,
+                    srcImage.resource(),
+                    srcImage.image(),
+                    srcImage.currentLayout(),
+                    dstImage.resource(),
+                    dstImage.image(),
+                    dstImage.currentLayout(),
+                    blitRegionCount,
+                    blitRegions,
+                    filter);
+}
+
+
 void GrVkPrimaryCommandBuffer::copyImageToBuffer(const GrVkGpu* gpu,
                                                  GrVkImage* srcImage,
                                                  VkImageLayout srcLayout,