Revert "Revert "Remove Gr*Gpu includes from header files.""

This reverts commit 56af45b03c542ef0bc198e42687bf685aafaae81.

Reason for revert: Relanding now that pre CL has relanded

Original change's description:
> Revert "Remove Gr*Gpu includes from header files."
> 
> This reverts commit 2bd381bffd36cdcffacf606d952547ce66fed7e9.
> 
> Reason for revert: Need to revert change this landed on top of
> 
> Original change's description:
> > Remove Gr*Gpu includes from header files.
> > 
> > Some general cleanup to try to keep use of the backend gpu class in cpps.
> > 
> > Bug: skia:
> > Change-Id: I1a28e0e5c2e55562b3fff56c284c3405b5b6d8bc
> > Reviewed-on: https://skia-review.googlesource.com/20057
> > Reviewed-by: Robert Phillips <robertphillips@google.com>
> > Commit-Queue: Greg Daniel <egdaniel@google.com>
> 
> TBR=egdaniel@google.com,robertphillips@google.com
> 
> Change-Id: I5b27d50654a17502c056d59b2d4f9609376d189e
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/20064
> Reviewed-by: Greg Daniel <egdaniel@google.com>
> Commit-Queue: Greg Daniel <egdaniel@google.com>

TBR=egdaniel@google.com,robertphillips@google.com

Change-Id: Id1656a7708223bc4dcc8eb4444ef41ada61be5d0
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20148
Reviewed-by: Greg Daniel <egdaniel@google.com>
Commit-Queue: Greg Daniel <egdaniel@google.com>

1 files changed, 10 insertions, 45 deletions

diff --git a/src/gpu/vk/GrVkCommandBuffer.h b/src/gpu/vk/GrVkCommandBuffer.h
index b387885fff..e602e4d574 100644
--- a/src/gpu/vk/GrVkCommandBuffer.h
+++ b/src/gpu/vk/GrVkCommandBuffer.h
@@ -14,11 +14,16 @@
 #include "GrVkUtil.h"
 #include "vk/GrVkDefines.h"
 
+class GrVkBuffer;
 class GrVkFramebuffer;
+class GrVkIndexBuffer;
+class GrVkImage;
 class GrVkPipeline;
+class GrVkPipelineState;
 class GrVkRenderPass;
 class GrVkRenderTarget;
 class GrVkTransferBuffer;
+class GrVkVertexBuffer;
 
 class GrVkCommandBuffer : public GrVkResource {
 public:
@@ -40,40 +45,9 @@ public:
                          BarrierType barrierType,
                          void* barrier) const;
 
-    static constexpr uint32_t kMaxInputBuffers = 2;
+    void bindInputBuffer(GrVkGpu* gpu, uint32_t binding, const GrVkVertexBuffer* vbuffer);
 
-    void 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 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 bindIndexBuffer(GrVkGpu* gpu, const GrVkIndexBuffer* ibuffer);
 
     void bindPipeline(const GrVkGpu* gpu, const GrVkPipeline* pipeline);
 
@@ -178,6 +152,8 @@ private:
 
     virtual void onReset(GrVkGpu* gpu) {}
 
+    static constexpr uint32_t kMaxInputBuffers = 2;
+
     VkBuffer fBoundInputBuffers[kMaxInputBuffers];
     VkBuffer fBoundIndexBuffer;
 
@@ -258,18 +234,7 @@ public:
                    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);
-    }
+                   VkFilter filter);
 
     void copyImageToBuffer(const GrVkGpu* gpu,
                            GrVkImage* srcImage,