Update how we send draws to gpu backend to reduce state setting.

src/gpu/vk/GrVkGpu.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrVkGpu_DEFINED
 #define GrVkGpu_DEFINED
 
 #include "GrGpu.h"
 #include "GrGpuFactory.h"
 #include "GrVkCaps.h"
 #include "GrVkIndexBuffer.h"
 #include "GrVkProgram.h"
 #include "GrVkResourceProvider.h"
 #include "GrVkVertexBuffer.h"
 #include "GrVkUtil.h"
 
 #include "shaderc/shaderc.h"
 #include "vulkan/vulkan.h"
 
 class GrPipeline;
-class GrNonInstancedVertices;
+class GrNonInstancedMesh;
 
 class GrVkBufferImpl;
 class GrVkCommandBuffer;
 class GrVkPipeline;
 class GrVkRenderPass;
 class GrVkTexture;
 struct GrVkInterface;
 
 class GrVkGpu : public GrGpu {
 public:
@@ skipping 22 matching lines @@
     };
 
     bool onGetReadPixelsInfo(GrSurface* srcSurface, int readWidth, int readHeight, size_t rowBytes,
                              GrPixelConfig readConfig, DrawPreference*,
                              ReadPixelTempDrawInfo*) override;
 
     bool onGetWritePixelsInfo(GrSurface* dstSurface, int width, int height,
                               GrPixelConfig srcConfig, DrawPreference*,
                               WritePixelTempDrawInfo*) override;
 
-    void buildProgramDesc(GrProgramDesc*, const GrPrimitiveProcessor&,
-                          const GrPipeline&) const override;
-
     void discard(GrRenderTarget*) override {
         SkDebugf("discard not yet implemented for Vulkan\n");
     }
 
     bool onCopySurface(GrSurface* dst,
                        GrSurface* src,
                        const SkIRect& srcRect,
                        const SkIPoint& dstPoint) override;
 
     void onGetMultisampleSpecs(GrRenderTarget* rt,
@@ skipping 67 matching lines @@
     }
 
     GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override;
     GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override;
     GrTransferBuffer* onCreateTransferBuffer(size_t size, TransferType type) override;
 
     void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override;
 
     void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override;
 
-    void onDraw(const DrawArgs&, const GrNonInstancedVertices&) override;
+    void onDraw(const GrPipeline&,
+                const GrPrimitiveProcessor&,
+                const GrMesh*,
+                int meshCount) override;
 
     bool onReadPixels(GrSurface* surface,
                       int left, int top, int width, int height,
                       GrPixelConfig,
                       void* buffer,
                       size_t rowBytes) override;
 
     bool onWritePixels(GrSurface* surface,
                        int left, int top, int width, int height,
                        GrPixelConfig config, const SkTArray<GrMipLevel>&) override;
 
     bool onTransferPixels(GrSurface*,
                           int left, int top, int width, int height,
                           GrPixelConfig config, GrTransferBuffer* buffer,
                           size_t offset, size_t rowBytes) override {
         SkDebugf("onTransferPixels not yet implemented for Vulkan\n");
         return false;
     }
 
     void onResolveRenderTarget(GrRenderTarget* target) override {
         SkDebugf("onResolveRenderTarget not yet implemented for Vulkan\n");
     }
 
+    bool prepareDrawState(const GrPipeline&,
+                          const GrPrimitiveProcessor&,
+                          GrPrimitiveType,
+                          const GrVkRenderPass&,
+                          GrVkProgram** program);
+
     // Bind vertex and index buffers
-    void bindGeometry(const GrPrimitiveProcessor&, const GrNonInstancedVertices&);
+    void bindGeometry(const GrPrimitiveProcessor&, const GrNonInstancedMesh&);
 
     // Ends and submits the current command buffer to the queue and then creates a new command
     // buffer and begins it. If sync is set to kForce_SyncQueue, the function will wait for all 
     // work in the queue to finish before returning.
     void submitCommandBuffer(SyncQueue sync);
 
     void copySurfaceAsCopyImage(GrSurface* dst,
                                 GrSurface* src,
                                 const SkIRect& srcRect,
                                 const SkIPoint& dstPoint);
@@ skipping 24 matching lines @@
     shaderc_compiler_t fCompiler;
 
     // This is only for our current testing and building. The client should be holding on to the
     // VkInstance.
     VkInstance                        fVkInstance;
 
     typedef GrGpu INHERITED;
 };
 
 #endif