diff options
| author |  jvanverth <jvanverth@google.com> | 2014-11-06 13:38:52 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-11-06 13:38:52 -0800 |
| commit | 06ba179838ba4fe187cf290750aeeb4a02a2960b (patch) | |
| tree | 1e77099a7fe0905ee476d5934ab57d1e71a76f73 /tools/PictureRenderingFlags.cpp | |
| parent | 2c93efeb6f2dd652eb2575c04124d82952f020c7 (diff) | |
Get gpudft support working in dm, gm, nanobench and bench_pictures
Adds a new config to test distance field text.
Clean up some flags and #defines to read "distance field text",
not "distance field fonts" to be consistent with Chromium
NOTREECHECKS=true
Review URL: https://codereview.chromium.org/699453005
Diffstat (limited to 'tools/PictureRenderingFlags.cpp')
| -rw-r--r-- | tools/PictureRenderingFlags.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/tools/PictureRenderingFlags.cpp b/tools/PictureRenderingFlags.cpp index d78229acce..ac72cad4c2 100644 --- a/tools/PictureRenderingFlags.cpp +++ b/tools/PictureRenderingFlags.cpp @@ -28,7 +28,7 @@ DEFINE_string(bbh, "none", "bbhType [width height]: Set the bounding box hierarc #if SK_SUPPORT_GPU static const char kGpuAPINameGL[] = "gl"; static const char kGpuAPINameGLES[] = "gles"; -#define GPU_CONFIG_STRING "|gpu|msaa4|msaa16|nvprmsaa4|nvprmsaa16" +#define GPU_CONFIG_STRING "|gpu|msaa4|msaa16|nvprmsaa4|nvprmsaa16|gpudft" #else #define GPU_CONFIG_STRING "" #endif @@ -286,6 +286,7 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) { } int sampleCount = 0; + bool useDFText = false; #endif if (FLAGS_config.count() > 0) { if (0 == strcmp(FLAGS_config[0], "8888")) { @@ -311,6 +312,10 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) { deviceType = sk_tools::PictureRenderer::kNVPR_DeviceType; sampleCount = 16; } + else if (0 == strcmp(FLAGS_config[0], "gpudft")) { + deviceType = sk_tools::PictureRenderer::kGPU_DeviceType; + useDFText = true; + } #if SK_ANGLE else if (0 == strcmp(FLAGS_config[0], "angle")) { deviceType = sk_tools::PictureRenderer::kAngle_DeviceType; @@ -336,6 +341,7 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) { } #if SK_SUPPORT_GPU renderer->setSampleCount(sampleCount); + renderer->setUseDFText(useDFText); #endif } |