diff options
| author |  Brian Osman <brianosman@google.com> | 2017-12-20 22:15:40 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-12-20 22:15:48 +0000 |
| commit | 2871436b2adf7fb126c2a113b70f7c1f2bbf9ef7 (patch) | |
| tree | 0d42230ada3f0b8fcb2e879de3757781b5bb66f4 /samplecode | |
| parent | 41c26eaf957c8ab3260d05ceddc0ed3f6f86bb2e (diff) | |
Revert "CCPR: Initial semi-optimized vertex shader Impl"
This reverts commit a8f6aef13d0592305e05baf19ee724f31a53b466.
Reason for revert: Looks to failing on ANGLE bots
Original change's description:
> CCPR: Initial semi-optimized vertex shader Impl
>
> Bug: skia:
> Change-Id: If22f47a3b945ce7336f8e609c2e0c911f09e1d18
> Reviewed-on: https://skia-review.googlesource.com/86820
> Reviewed-by: Brian Salomon <bsalomon@google.com>
> Commit-Queue: Chris Dalton <csmartdalton@google.com>
TBR=egdaniel@google.com,bsalomon@google.com,csmartdalton@google.com
Change-Id: Ic5a73434cba4246a72790db2c27d06e7a50f389a
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/88220
Reviewed-by: Brian Osman <brianosman@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'samplecode')
| -rw-r--r-- | samplecode/SampleCCPRGeometry.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/samplecode/SampleCCPRGeometry.cpp b/samplecode/SampleCCPRGeometry.cpp index 2efb0e6b14..92892c239b 100644 --- a/samplecode/SampleCCPRGeometry.cpp +++ b/samplecode/SampleCCPRGeometry.cpp @@ -236,10 +236,6 @@ void CCPRGeometryView::updateGpuData() { GrCCPRGeometry::Verb::kEndClosedContour == verb) { continue; } - if (GrCCPRGeometry::Verb::kLineTo == verb) { - ++ptsIdx; - continue; - } SkASSERT(GrCCPRGeometry::Verb::kMonotonicQuadraticTo == verb); fTriangleInstances.push_back().set(&geometry.points()[ptsIdx], Sk2f(0, 0)); ptsIdx += 2; @@ -255,14 +251,10 @@ void CCPRGeometryView::Op::onExecute(GrOpFlushState* state) { GrGLGpu* glGpu = kOpenGL_GrBackend == context->contextPriv().getBackend() ? static_cast<GrGLGpu*>(state->gpu()) : nullptr; - if (!GrCCPRCoverageProcessor::DoesRenderPass(fView->fRenderPass, *state->caps().shaderCaps())) { - return; - } - - GrCCPRCoverageProcessor proc(rp, fView->fRenderPass, *state->caps().shaderCaps()); + GrCCPRCoverageProcessor proc(fView->fRenderPass); SkDEBUGCODE(proc.enableDebugVisualizations(kDebugBloat);) - SkSTArray<1, GrMesh> mesh; + SkSTArray<1, GrMesh, true> mesh; if (GrCCPRCoverageProcessor::RenderPassIsCubic(fView->fRenderPass)) { sk_sp<GrBuffer> instBuff(rp->createBuffer(fView->fCubicInstances.count() * sizeof(CubicInstance), kVertex_GrBufferType, |