diff options
author | jvanverth <jvanverth@google.com> | 2014-11-06 13:52:45 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2014-11-06 13:52:45 -0800 |
commit | aa30ab3079ad3c1f408e3f170dac1cdd42ed2b62 (patch) | |
tree | bca7bf2584494be08b4e2e0905a39709c436b424 /tools | |
parent | 06ba179838ba4fe187cf290750aeeb4a02a2960b (diff) |
Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures (patchset #2 id:20001 of https://codereview.chromium.org/699453005/)
Reason for revert:
Not compiling in ANGLE build
Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/06ba179838ba4fe187cf290750aeeb4a02a2960b
TBR=bsalomon@google.com,mtklein@google.com,reed@google.com
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/707723005
Diffstat (limited to 'tools')
-rw-r--r-- | tools/PictureRenderer.cpp | 4 | ||||
-rw-r--r-- | tools/PictureRenderer.h | 10 | ||||
-rw-r--r-- | tools/PictureRenderingFlags.cpp | 8 | ||||
-rw-r--r-- | tools/flags/SkCommonFlags.cpp | 2 |
4 files changed, 3 insertions, 21 deletions
diff --git a/tools/PictureRenderer.cpp b/tools/PictureRenderer.cpp index 1c31e6865a..e4a69986db 100644 --- a/tools/PictureRenderer.cpp +++ b/tools/PictureRenderer.cpp @@ -161,10 +161,8 @@ SkCanvas* PictureRenderer::setupCanvas(int width, int height) { return NULL; } - uint32_t flags = fUseDFText ? SkGpuDevice::kDFText_Flag : 0; SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(target, - SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType), - flags)); + SkSurfaceProps(SkSurfaceProps::kLegacyFontHost_InitType))); canvas = SkNEW_ARGS(SkCanvas, (device.get())); break; } diff --git a/tools/PictureRenderer.h b/tools/PictureRenderer.h index c8462d9f03..e82eb7fb8a 100644 --- a/tools/PictureRenderer.h +++ b/tools/PictureRenderer.h @@ -220,10 +220,6 @@ public: void setSampleCount(int sampleCount) { fSampleCount = sampleCount; } - - void setUseDFText(bool useDFText) { - fUseDFText = useDFText; - } #endif void setDrawFilters(DrawFilterFlags const * const filters, const SkString& configName) { @@ -278,8 +274,6 @@ public: case kGPU_DeviceType: if (fSampleCount) { config.appendf("_msaa%d", fSampleCount); - } else if (fUseDFText) { - config.append("_gpudft"); } else { config.append("_gpu"); } @@ -331,8 +325,6 @@ public: tmp = "msaa"; tmp.appendS32(fSampleCount); result["config"] = tmp.c_str(); - } else if (fUseDFText) { - result["config"] = "gpudft"; } else { result["config"] = "gpu"; } @@ -436,7 +428,6 @@ public: , fGrContextFactory(opts) , fGrContext(NULL) , fSampleCount(0) - , fUseDFText(false) #endif { fGridInfo.fMargin.setEmpty(); @@ -504,7 +495,6 @@ private: GrContextFactory fGrContextFactory; GrContext* fGrContext; int fSampleCount; - bool fUseDFText; #endif virtual SkString getConfigNameInternal() = 0; diff --git a/tools/PictureRenderingFlags.cpp b/tools/PictureRenderingFlags.cpp index ac72cad4c2..d78229acce 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|gpudft" +#define GPU_CONFIG_STRING "|gpu|msaa4|msaa16|nvprmsaa4|nvprmsaa16" #else #define GPU_CONFIG_STRING "" #endif @@ -286,7 +286,6 @@ 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")) { @@ -312,10 +311,6 @@ 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; @@ -341,7 +336,6 @@ sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) { } #if SK_SUPPORT_GPU renderer->setSampleCount(sampleCount); - renderer->setUseDFText(useDFText); #endif } diff --git a/tools/flags/SkCommonFlags.cpp b/tools/flags/SkCommonFlags.cpp index c7fc17f047..4d329c5f30 100644 --- a/tools/flags/SkCommonFlags.cpp +++ b/tools/flags/SkCommonFlags.cpp @@ -9,7 +9,7 @@ DEFINE_string(config, "565 8888 pdf gpu nonrendering angle nvprmsaa4", "Options: 565 8888 pdf gpu nonrendering msaa4 msaa16 nvprmsaa4 nvprmsaa16 " - "gpudft gpunull gpudebug angle mesa"); + "gpunull gpudebug angle mesa"); DEFINE_bool(cpu, true, "master switch for running CPU-bound work."); |