Revert of Enable viewer in non-Vulkan builds

tools/viewer/Viewer.cpp

 /*
 * Copyright 2016 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "Viewer.h"
 
 #include "GMSlide.h"
@@ skipping 48 matching lines @@
 DEFINE_string(jpgs, "/data/local/tmp/skia", "Directory to read jpgs from.");
 DEFINE_bool(vulkan, false, "Run with Vulkan.");
 #else
 DEFINE_string(skps, "skps", "Directory to read skps from.");
 DEFINE_string(jpgs, "jpgs", "Directory to read jpgs from.");
 DEFINE_bool(vulkan, true, "Run with Vulkan.");
 #endif
 
 const char *kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = {
     " [OpenGL]",
-#ifdef SK_VULKAN
     " [Vulkan]",
-#endif
     " [Raster]"
 };
 
 const char* kName = "name";
 const char* kValue = "value";
 const char* kOptions = "options";
 const char* kSlideStateName = "Slide";
 const char* kBackendStateName = "Backend";
 const char* kSoftkeyStateName = "Softkey";
 const char* kSoftkeyHint = "Please select a softkey";
 const char* kFpsStateName = "FPS";
 const char* kSplitScreenStateName = "Split screen";
 const char* kON = "ON";
 const char* kOFF = "OFF";
 
 Viewer::Viewer(int argc, char** argv, void* platformData)
     : fCurrentMeasurement(0)
     , fDisplayStats(false)
     , fSplitScreen(false)
-    , fBackendType(sk_app::Window::kNativeGL_BackendType)
+    , fBackendType(sk_app::Window::kVulkan_BackendType)
     , fZoomCenterX(0.0f)
     , fZoomCenterY(0.0f)
     , fZoomLevel(0.0f)
     , fZoomScale(SK_Scalar1)
 {
     memset(fMeasurements, 0, sizeof(fMeasurements));
 
     SkDebugf("Command line arguments: ");
     for (int i = 1; i < argc; ++i) {
         SkDebugf("%s ", argv[i]);
     }
     SkDebugf("\n");
 
     SkCommandLineFlags::Parse(argc, argv);
 
-#ifdef SK_VULKAN
     fBackendType = FLAGS_vulkan ? sk_app::Window::kVulkan_BackendType
                                 : sk_app::Window::kNativeGL_BackendType;
-#endif
+
     fWindow = Window::CreateNativeWindow(platformData);
     fWindow->attach(fBackendType, DisplayParams());
 
     // register callbacks
     fCommands.attach(fWindow);
     fWindow->registerPaintFunc(on_paint_handler, this);
     fWindow->registerTouchFunc(on_touch_handler, this);
     fWindow->registerUIStateChangedFunc(on_ui_state_changed_handler, this);
 
     // add key-bindings
@@ skipping 441 matching lines @@
         bool newSplitScreen = stateValue.equals(kON);
         if (newSplitScreen != fSplitScreen) {
             fSplitScreen = newSplitScreen;
             fWindow->inval();
             updateUIState();
         }
     } else {
         SkDebugf("Unknown stateName: %s", stateName.c_str());
     }
 }