diff options
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/flags/SkCommonFlags.cpp | 2 | ||||
| -rw-r--r-- | tools/flags/SkCommonFlagsGpu.h | 2 | ||||
| -rw-r--r-- | tools/viewer/Viewer.cpp | 7 |
3 files changed, 1 insertions, 10 deletions
diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index b1c6e67ba7..90656077c2 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -163,7 +163,7 @@ DEFINE_bool(noGS, false, "Disables support for geometry shaders."); DEFINE_string(pr, "default", "Set of enabled gpu path renderers. Defined as a list of: " - "[[~]all [~]default [~]dashline [~]nvpr [~]msaa [~]aaconvex " + "[~]all [~]default [~]dashline [~]nvpr [~]aaconvex " "[~]aalinearizing [~]small [~]tess]"); void SetCtxOptionsFromCommonFlags(GrContextOptions* ctxOptions) { diff --git a/tools/flags/SkCommonFlagsGpu.h b/tools/flags/SkCommonFlagsGpu.h index ffaf2d437f..92986e9c3e 100644 --- a/tools/flags/SkCommonFlagsGpu.h +++ b/tools/flags/SkCommonFlagsGpu.h @@ -28,8 +28,6 @@ inline GpuPathRenderers get_named_pathrenderers_flags(const char* name) { return GpuPathRenderers::kDashLine; } else if (!strcmp(name, "nvpr")) { return GpuPathRenderers::kStencilAndCover; - } else if (!strcmp(name, "msaa")) { - return GpuPathRenderers::kMSAA; } else if (!strcmp(name, "aaconvex")) { return GpuPathRenderers::kAAConvex; } else if (!strcmp(name, "aalinearizing")) { diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 16a91fa08a..04426ffc7e 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -187,7 +187,6 @@ Viewer::Viewer(int argc, char** argv, void* platformData) gPathRendererNames[GpuPathRenderers::kDefault] = "Default Ganesh Behavior (best path renderer, not including CCPR)"; gPathRendererNames[GpuPathRenderers::kStencilAndCover] = "NV_path_rendering"; - gPathRendererNames[GpuPathRenderers::kMSAA] = "Sample shading"; gPathRendererNames[GpuPathRenderers::kSmall] = "Small paths (cached sdf or alpha masks)"; gPathRendererNames[GpuPathRenderers::kCoverageCounting] = "Coverage counting"; gPathRendererNames[GpuPathRenderers::kTessellating] = "Tessellating"; @@ -1328,9 +1327,6 @@ void Viewer::drawImGui() { if (ctx->caps()->shaderCaps()->pathRenderingSupport()) { prButton(GpuPathRenderers::kStencilAndCover); } - if (ctx->caps()->sampleShadingSupport()) { - prButton(GpuPathRenderers::kMSAA); - } prButton(GpuPathRenderers::kTessellating); prButton(GpuPathRenderers::kNone); } else { @@ -1667,9 +1663,6 @@ void Viewer::updateUIState() { if (ctx->caps()->shaderCaps()->pathRenderingSupport()) { prState[kOptions].append(gPathRendererNames[GpuPathRenderers::kStencilAndCover]); } - if (ctx->caps()->sampleShadingSupport()) { - prState[kOptions].append(gPathRendererNames[GpuPathRenderers::kMSAA]); - } prState[kOptions].append(gPathRendererNames[GpuPathRenderers::kTessellating]); prState[kOptions].append(gPathRendererNames[GpuPathRenderers::kNone]); } else { |