Revert of Get gpudft support working in dm, gm, nanobench and bench_pictures

tools/PictureRenderingFlags.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "PictureRenderingFlags.h"
 
 #include "CopyTilesRenderer.h"
@@ skipping 10 matching lines @@
               "be used. Accepted values are: none, rtree, grid. "
               "Not compatible with --pipe. With value "
               "'grid', width and height must be specified. 'grid' can "
               "only be used with modes tile, record, and "
               "playbackCreation.");
 
 
 #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
 #if SK_ANGLE
 #define ANGLE_CONFIG_STRING "|angle"
 #else
 #define ANGLE_CONFIG_STRING ""
 #endif
 #if SK_MESA
 #define MESA_CONFIG_STRING "|mesa"
@@ skipping 237 matching lines @@
         } else {
             error.printf("--gpuAPI invalid api value.\n");
             return NULL;
         }
     } else if (FLAGS_gpuAPI.count() > 1) {
         error.printf("--gpuAPI invalid api value.\n");
         return NULL;
     }
 
     int sampleCount = 0;
-    bool useDFText = false;
 #endif
     if (FLAGS_config.count() > 0) {
         if (0 == strcmp(FLAGS_config[0], "8888")) {
             deviceType = sk_tools::PictureRenderer::kBitmap_DeviceType;
         }
 #if SK_SUPPORT_GPU
         else if (0 == strcmp(FLAGS_config[0], "gpu")) {
             deviceType = sk_tools::PictureRenderer::kGPU_DeviceType;
         }
         else if (0 == strcmp(FLAGS_config[0], "msaa4")) {
             deviceType = sk_tools::PictureRenderer::kGPU_DeviceType;
             sampleCount = 4;
         }
         else if (0 == strcmp(FLAGS_config[0], "msaa16")) {
             deviceType = sk_tools::PictureRenderer::kGPU_DeviceType;
             sampleCount = 16;
         }
         else if (0 == strcmp(FLAGS_config[0], "nvprmsaa4")) {
             deviceType = sk_tools::PictureRenderer::kNVPR_DeviceType;
             sampleCount = 4;
         }
         else if (0 == strcmp(FLAGS_config[0], "nvprmsaa16")) {
             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;
         }
 #endif
 #if SK_MESA
         else if (0 == strcmp(FLAGS_config[0], "mesa")) {
             deviceType = sk_tools::PictureRenderer::kMesa_DeviceType;
         }
 #endif
 #endif
         else {
             error.printf("%s is not a valid mode for --config\n", FLAGS_config[0]);
             return NULL;
         }
 #if SK_SUPPORT_GPU
         if (!renderer->setDeviceType(deviceType, gpuAPI)) {
 #else
         if (!renderer->setDeviceType(deviceType)) {
 #endif
             error.printf("Could not create backend for --config %s\n", FLAGS_config[0]);
             return NULL;
         }
 #if SK_SUPPORT_GPU
         renderer->setSampleCount(sampleCount);
-        renderer->setUseDFText(useDFText);
 #endif
     }
 
 
     sk_tools::PictureRenderer::BBoxHierarchyType bbhType
             = sk_tools::PictureRenderer::kNone_BBoxHierarchyType;
     if (FLAGS_bbh.count() > 0) {
         const char* type = FLAGS_bbh[0];
         if (0 == strcmp(type, "none")) {
             bbhType = sk_tools::PictureRenderer::kNone_BBoxHierarchyType;
@@ skipping 20 matching lines @@
         if (FLAGS_pipe && sk_tools::PictureRenderer::kNone_BBoxHierarchyType != bbhType) {
             error.printf("--pipe and --bbh cannot be used together\n");
             return NULL;
         }
     }
     renderer->setBBoxHierarchyType(bbhType);
     renderer->setScaleFactor(SkDoubleToScalar(FLAGS_scale));
 
     return renderer.detach();
 }