diff options
| author |  Chris Dalton <csmartdalton@google.com> | 2017-06-12 20:44:08 -0600 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-13 14:25:21 +0000 |
| commit | f7eb015083aba8942031145736251dd32094115d (patch) | |
| tree | 97ed397a5e8189b8c3600842c9be1ce1d46ab5ba /src/gpu/vk/GrVkPipelineState.cpp | |
| parent | e93cf97175d348ce1400762bdd8d9acabdd29766 (diff) | |
Add GrPrimitiveType::kLinesAdjacency
Converts GrPrimitiveType to an enum class and adds kLinesAdjacency.
Bug: skia:
Change-Id: If57d26277182aac1375e8181211ddaf7ea6d1e0a
Reviewed-on: https://skia-review.googlesource.com/19581
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
Diffstat (limited to 'src/gpu/vk/GrVkPipelineState.cpp')
| -rw-r--r-- | src/gpu/vk/GrVkPipelineState.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gpu/vk/GrVkPipelineState.cpp b/src/gpu/vk/GrVkPipelineState.cpp index 525d75f3da..eb4a516343 100644 --- a/src/gpu/vk/GrVkPipelineState.cpp +++ b/src/gpu/vk/GrVkPipelineState.cpp @@ -570,7 +570,7 @@ bool GrVkPipelineState::Desc::Build(Desc* desc, const GrStencilSettings& stencil, GrPrimitiveType primitiveType, const GrShaderCaps& caps) { - if (!INHERITED::Build(desc, primProc, primitiveType == kPoints_GrPrimitiveType, pipeline, + if (!INHERITED::Build(desc, primProc, primitiveType == GrPrimitiveType::kPoints, pipeline, caps)) { return false; } @@ -583,7 +583,7 @@ bool GrVkPipelineState::Desc::Build(Desc* desc, b.add32(get_blend_info_key(pipeline)); - b.add32(primitiveType); + b.add32((uint32_t)primitiveType); return true; } |