commit 27059d36d63284b1af2c25e0e5a52c17485c54d7
author Chris Dalton <csmartdalton@google.com> Tue Jan 23 14:06:50 2018 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Tue Jan 23 21:29:10 2018 +0000
tree d2a8bb6c085dec3d800dd0f9922412ddf968ff94
parent 80747ef591ff3c09c2b610eb21258132d1ff4ef5

ccpr: Use primitive restart feature on ARM

Bug: skia:
Change-Id: Ia7ab55f8b6ecdd674762f5197d35e8db58f07c01
Reviewed-on: https://skia-review.googlesource.com/98180
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Reviewed-by: Brian Salomon <bsalomon@google.com>

src/gpu/ccpr/GrCCPathProcessor.h

diff --git a/src/gpu/ccpr/GrCCPathProcessor.h b/src/gpu/ccpr/GrCCPathProcessor.h
index 0b89358..644fbba 100644
--- a/src/gpu/ccpr/GrCCPathProcessor.h
+++ b/src/gpu/ccpr/GrCCPathProcessor.h
@@ -8,12 +8,12 @@
 #ifndef GrCCPathProcessor_DEFINED
 #define GrCCPathProcessor_DEFINED
 
+#include "GrCaps.h"
 #include "GrGeometryProcessor.h"
 #include "SkPath.h"
 #include <array>
 
 class GrOnFlushResourceProvider;
-class GrShaderCaps;
 
 /**
  * This class draws AA paths using the coverage count masks produced by GrCCCoverageProcessor.
@@ -22,12 +22,10 @@
  * fill rule.
  *
  * The caller must set up an instance buffer as detailed below, then draw indexed-instanced
- * triangles using the index and vertex buffers provided by this class.
+ * meshes using the buffers and parameters provided by this class.
  */
 class GrCCPathProcessor : public GrGeometryProcessor {
 public:
-    static constexpr int kPerInstanceIndexCount = 6 * 3;
-
     enum class InstanceAttribs {
         kDevBounds,
         kDevBounds45,
@@ -52,11 +50,15 @@
 
     GR_STATIC_ASSERT(4 * 16 == sizeof(Instance));
 
-    static sk_sp<const GrBuffer> FindIndexBuffer(GrOnFlushResourceProvider*);
+    static GrPrimitiveType MeshPrimitiveType(const GrCaps& caps) {
+        return caps.usePrimitiveRestart() ? GrPrimitiveType::kTriangleStrip
+                                          : GrPrimitiveType::kTriangles;
+    }
     static sk_sp<const GrBuffer> FindVertexBuffer(GrOnFlushResourceProvider*);
+    static sk_sp<const GrBuffer> FindIndexBuffer(GrOnFlushResourceProvider*);
+    static int NumIndicesPerInstance(const GrCaps&);
 
-    GrCCPathProcessor(GrResourceProvider*, sk_sp<GrTextureProxy> atlas, SkPath::FillType,
-                      const GrShaderCaps&);
+    GrCCPathProcessor(GrResourceProvider*, sk_sp<GrTextureProxy> atlas, SkPath::FillType);
 
     const char* name() const override { return "GrCCPathProcessor"; }
     const GrSurfaceProxy* atlasProxy() const { return fAtlasAccess.proxy(); }