Revert of Support using OpenGL ES context on desktop

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"
 #include "PictureRenderer.h"
 #include "picture_utils.h"
 #include "SkCommandLineFlags.h"
 #include "SkData.h"
 #include "SkImage.h"
 #include "SkImageDecoder.h"
 #include "SkString.h"
 
 // Alphabetized list of flags used by this file or bench_ and render_pictures.
 DEFINE_string(bbh, "none", "bbhType [width height]: Set the bounding box hierarchy type to "
               "be used. Accepted values are: none, rtree, quadtree, 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"
 #else
 #define GPU_CONFIG_STRING ""
 #endif
 #if SK_ANGLE
 #define ANGLE_CONFIG_STRING "|angle"
 #else
 #define ANGLE_CONFIG_STRING ""
 #endif
 #if SK_MESA
@@ skipping 28 matching lines @@
               "rerecord: (Only in render_pictures) Record the picture as a new skp,\n"
               "\twith the bitmaps PNG encoded.\n");
 DEFINE_int32(multi, 1, "Set the number of threads for multi threaded drawing. "
              "If > 1, requires tiled rendering.");
 DEFINE_bool(pipe, false, "Use SkGPipe rendering. Currently incompatible with \"mode\".");
 DEFINE_string2(readPath, r, "", "skp files or directories of skp files to process.");
 DEFINE_double(scale, 1, "Set the scale factor.");
 DEFINE_string(tiles, "", "Used with --mode copyTile to specify number of tiles per larger tile "
               "in the x and y directions.");
 DEFINE_string(viewport, "", "width height: Set the viewport.");
-#if SK_SUPPORT_GPU
-DEFINE_string(gpuAPI, "", "Force use of specific gpu API.  Using \"gl\" "
-              "forces OpenGL API. Using \"gles\" forces OpenGL ES API. "
-              "Defaults to empty string, which selects the API native to the "
-              "system.");
-#endif
 
 sk_tools::PictureRenderer* parseRenderer(SkString& error, PictureTool tool) {
     error.reset();
 
     if (FLAGS_multi <= 0) {
         error.printf("--multi must be > 0, was %i", FLAGS_multi);
         return NULL;
     }
 
     bool useTiles = false;
@@ skipping 167 matching lines @@
         }
         SkISize viewport;
         viewport.fWidth = atoi(FLAGS_viewport[0]);
         viewport.fHeight = atoi(FLAGS_viewport[1]);
         renderer->setViewport(viewport);
     }
 
     sk_tools::PictureRenderer::SkDeviceTypes deviceType =
         sk_tools::PictureRenderer::kBitmap_DeviceType;
 #if SK_SUPPORT_GPU
-    GrGLStandard gpuAPI = kNone_GrGLStandard;
-    if (1 == FLAGS_gpuAPI.count()) {
-        if (FLAGS_gpuAPI.contains(kGpuAPINameGL)) {
-            gpuAPI = kGL_GrGLStandard;
-        } else if (FLAGS_gpuAPI.contains(kGpuAPINameGLES)) {
-            gpuAPI = kGLES_GrGLStandard;
-        } 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;
 #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;
             if (FLAGS_multi > 1) {
@@ skipping 49 matching lines @@
                 error.printf("Mesa not compatible with multithreaded tiling.\n");
                 return NULL;
             }
         }
 #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;
-        }
+        renderer->setDeviceType(deviceType);
 #if SK_SUPPORT_GPU
         renderer->setSampleCount(sampleCount);
 #endif
     }
 
 
     sk_tools::PictureRenderer::BBoxHierarchyType bbhType
             = sk_tools::PictureRenderer::kNone_BBoxHierarchyType;
     if (FLAGS_bbh.count() > 0) {
         const char* type = FLAGS_bbh[0];
@@ skipping 24 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();
 }