diff options
| author |  Ravi Mistry <rmistry@google.com> | 2017-06-13 14:45:23 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-13 14:45:32 +0000 |
| commit | 7cd974fc7d7d1c197f961136775e188468f02ec9 (patch) | |
| tree | 48eff63b1d2326320d6b62b01b8409925908d896 /src/gpu/GrGpuCommandBuffer.cpp | |
| parent | a611be86f044ae2d17ca5acc12895b53ca067d79 (diff) | |
Revert "Add GrPrimitiveType::kLinesAdjacency"
This reverts commit f7eb015083aba8942031145736251dd32094115d.
Reason for revert: Looks like this is causing build failures:
* https://chromium-swarm.appspot.com/task?id=36baaf4d376bbf10&refresh=10
* https://chromium-swarm.appspot.com/task?id=36baad1f17e93510&refresh=10
Original change's description:
> 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>
TBR=bsalomon@google.com,csmartdalton@google.com
Change-Id: I37a1c575123b357abd8b9af9eea8871fe199f44b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/19661
Reviewed-by: Ravi Mistry <rmistry@google.com>
Commit-Queue: Ravi Mistry <rmistry@google.com>
Diffstat (limited to 'src/gpu/GrGpuCommandBuffer.cpp')
| -rw-r--r-- | src/gpu/GrGpuCommandBuffer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/gpu/GrGpuCommandBuffer.cpp b/src/gpu/GrGpuCommandBuffer.cpp index d9a2fa880b..9659ca3b9a 100644 --- a/src/gpu/GrGpuCommandBuffer.cpp +++ b/src/gpu/GrGpuCommandBuffer.cpp @@ -45,8 +45,6 @@ bool GrGpuCommandBuffer::draw(const GrPipeline& pipeline, #ifdef SK_DEBUG SkASSERT(!primProc.hasInstanceAttribs() || this->gpu()->caps()->instanceAttribSupport()); for (int i = 0; i < meshCount; ++i) { - SkASSERT(GrPrimitiveType::kLinesAdjacency != meshes[i].primitiveType() || - this->gpu()->caps()->shaderCaps()->geometryShaderSupport()); SkASSERT(primProc.hasVertexAttribs() == meshes[i].hasVertexData()); SkASSERT(primProc.hasInstanceAttribs() == meshes[i].isInstanced()); } |