diff options
| author |  Brian Osman <brianosman@google.com> | 2018-07-10 11:41:22 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-07-10 20:03:45 +0000 |
| commit | 1994f20d79055b9279b68236176073cf07db293f (patch) | |
| tree | c7945e187aee9e277b26b45a1c4276a1f42cbe2e /tools | |
| parent | 3c9bfec0d576234345613dd309edb7c0e48d533f (diff) | |
Merge "All" and "Default" path renderer options in viewer
This removes a confusing pair of radio buttons that were always in sync
Change-Id: I9bb2d4b944c1bba67f29f71e51c070c20b10d0ef
Reviewed-on: https://skia-review.googlesource.com/140242
Auto-Submit: Brian Osman <brianosman@google.com>
Reviewed-by: Chris Dalton <csmartdalton@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/viewer/Viewer.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 27c88191c3..bdb4459dc6 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -200,8 +200,6 @@ Viewer::Viewer(int argc, char** argv, void* platformData) SkGraphics::Init(); gPathRendererNames[GpuPathRenderers::kAll] = "All Path Renderers"; - gPathRendererNames[GpuPathRenderers::kDefault] = - "Default Ganesh Behavior (best path renderer, not including CCPR)"; gPathRendererNames[GpuPathRenderers::kStencilAndCover] = "NV_path_rendering"; gPathRendererNames[GpuPathRenderers::kSmall] = "Small paths (cached sdf or alpha masks)"; gPathRendererNames[GpuPathRenderers::kCoverageCounting] = "Coverage counting"; @@ -841,7 +839,7 @@ void Viewer::updateTitle() { title.append("]"); GpuPathRenderers pr = fWindow->getRequestedDisplayParams().fGrContextOptions.fGpuPathRenderers; - if (GpuPathRenderers::kDefault != pr) { + if (GpuPathRenderers::kAll != pr) { title.appendf(" [Path renderer: %s]", gPathRendererNames[pr].c_str()); } @@ -1524,7 +1522,6 @@ void Viewer::drawImGui() { if (!ctx) { ImGui::RadioButton("Software", true); } else if (fWindow->sampleCount() > 1) { - prButton(GpuPathRenderers::kDefault); prButton(GpuPathRenderers::kAll); if (ctx->contextPriv().caps()->shaderCaps()->pathRenderingSupport()) { prButton(GpuPathRenderers::kStencilAndCover); @@ -1532,7 +1529,6 @@ void Viewer::drawImGui() { prButton(GpuPathRenderers::kTessellating); prButton(GpuPathRenderers::kNone); } else { - prButton(GpuPathRenderers::kDefault); prButton(GpuPathRenderers::kAll); if (GrCoverageCountingPathRenderer::IsSupported( *ctx->contextPriv().caps())) { @@ -1974,7 +1970,6 @@ void Viewer::updateUIState() { } else { const auto* caps = ctx->contextPriv().caps(); - writer.appendString(gPathRendererNames[GpuPathRenderers::kDefault].c_str()); writer.appendString(gPathRendererNames[GpuPathRenderers::kAll].c_str()); if (fWindow->sampleCount() > 1) { if (caps->shaderCaps()->pathRenderingSupport()) { |