diff options
| author |  Brian Salomon <bsalomon@google.com> | 2018-04-30 12:55:36 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-30 18:36:43 +0000 |
| commit | fb68b3bce21ad22ef91cb8502b375deba6874d23 (patch) | |
| tree | dae654b498b1f28eb576b2caae471e5b3e26c927 | |
| parent | 13496cbab97f423d142c05b0ca5504af15b544b8 (diff) | |
Remove GrPrimitiveType::kTriangleFan
Change-Id: Ia121198ebcdc34e32a3ff99b0821047256df282d
Reviewed-on: https://skia-review.googlesource.com/124503
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Brian Salomon <bsalomon@google.com>
| -rw-r--r-- | include/private/GrTypesPriv.h | 5 | ||||
| -rw-r--r-- | src/gpu/gl/GrGLGpu.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/ops/GrDrawVerticesOp.cpp | 2 | ||||
| -rw-r--r-- | src/gpu/vk/GrVkPipeline.cpp | 2 |
4 files changed, 1 insertions, 10 deletions
diff --git a/include/private/GrTypesPriv.h b/include/private/GrTypesPriv.h index ecbd616567..e0f31fa5f9 100644 --- a/include/private/GrTypesPriv.h +++ b/include/private/GrTypesPriv.h @@ -79,7 +79,6 @@ static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig; enum class GrPrimitiveType { kTriangles, kTriangleStrip, - kTriangleFan, kPoints, kLines, // 1 pix wide only kLineStrip, // 1 pix wide only @@ -94,9 +93,7 @@ static constexpr bool GrIsPrimTypeLines(GrPrimitiveType type) { } static constexpr bool GrIsPrimTypeTris(GrPrimitiveType type) { - return GrPrimitiveType::kTriangles == type || - GrPrimitiveType::kTriangleStrip == type || - GrPrimitiveType::kTriangleFan == type; + return GrPrimitiveType::kTriangles == type || GrPrimitiveType::kTriangleStrip == type; } static constexpr bool GrPrimTypeRequiresGeometryShaderSupport(GrPrimitiveType type) { diff --git a/src/gpu/gl/GrGLGpu.cpp b/src/gpu/gl/GrGLGpu.cpp index 8a5c2357d1..ba85868ddd 100644 --- a/src/gpu/gl/GrGLGpu.cpp +++ b/src/gpu/gl/GrGLGpu.cpp @@ -2599,8 +2599,6 @@ static GrGLenum gr_primitive_type_to_gl_mode(GrPrimitiveType primitiveType) { return GR_GL_TRIANGLES; case GrPrimitiveType::kTriangleStrip: return GR_GL_TRIANGLE_STRIP; - case GrPrimitiveType::kTriangleFan: - return GR_GL_TRIANGLE_FAN; case GrPrimitiveType::kPoints: return GR_GL_POINTS; case GrPrimitiveType::kLines: diff --git a/src/gpu/ops/GrDrawVerticesOp.cpp b/src/gpu/ops/GrDrawVerticesOp.cpp index 61696f5ea4..329fa81dfa 100644 --- a/src/gpu/ops/GrDrawVerticesOp.cpp +++ b/src/gpu/ops/GrDrawVerticesOp.cpp @@ -312,7 +312,6 @@ static uint32_t seed_vertices(GrPrimitiveType type) { switch (type) { case GrPrimitiveType::kTriangles: case GrPrimitiveType::kTriangleStrip: - case GrPrimitiveType::kTriangleFan: return 3; case GrPrimitiveType::kPoints: return 1; @@ -333,7 +332,6 @@ static uint32_t primitive_vertices(GrPrimitiveType type) { case GrPrimitiveType::kLines: return 2; case GrPrimitiveType::kTriangleStrip: - case GrPrimitiveType::kTriangleFan: case GrPrimitiveType::kPoints: case GrPrimitiveType::kLineStrip: return 1; diff --git a/src/gpu/vk/GrVkPipeline.cpp b/src/gpu/vk/GrVkPipeline.cpp index 4058317b5d..a70a78504e 100644 --- a/src/gpu/vk/GrVkPipeline.cpp +++ b/src/gpu/vk/GrVkPipeline.cpp @@ -108,8 +108,6 @@ static VkPrimitiveTopology gr_primitive_type_to_vk_topology(GrPrimitiveType prim return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_LIST; case GrPrimitiveType::kTriangleStrip: return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_STRIP; - case GrPrimitiveType::kTriangleFan: - return VK_PRIMITIVE_TOPOLOGY_TRIANGLE_FAN; case GrPrimitiveType::kPoints: return VK_PRIMITIVE_TOPOLOGY_POINT_LIST; case GrPrimitiveType::kLines: |