Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(261)

Unified Diff: tools/viewer/sk_app/android/Window_android.cpp

Issue 2072563002: Revert of Enable viewer in non-Vulkan builds (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « tools/viewer/sk_app/Window.cpp ('k') | tools/viewer/sk_app/unix/GLWindowContext_unix.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/viewer/sk_app/android/Window_android.cpp
diff --git a/tools/viewer/sk_app/android/Window_android.cpp b/tools/viewer/sk_app/android/Window_android.cpp
index 60d89eb3ece6013a4e9616653bae5a2b21550ccb..94ba9b00dfadee00a171a24b5b85fff35f28e298 100644
--- a/tools/viewer/sk_app/android/Window_android.cpp
+++ b/tools/viewer/sk_app/android/Window_android.cpp
@@ -7,9 +7,7 @@
#include "Window_android.h"
#include "../GLWindowContext.h"
-#ifdef SK_VULKAN
#include "../VulkanWindowContext.h"
-#endif
#include "../RasterWindowContext.h"
namespace sk_app {
@@ -64,17 +62,15 @@
platformData.fNativeWindow = window;
switch (fBackendType) {
case kNativeGL_BackendType:
- default:
fWindowContext = GLWindowContext::Create((void*)&platformData, fDisplayParams);
break;
case kRaster_BackendType:
fWindowContext = RasterWindowContext::Create((void*)&platformData, fDisplayParams);
break;
-#ifdef SK_VULKAN
case kVulkan_BackendType:
+ default:
fWindowContext = VulkanWindowContext::Create((void*)&platformData, fDisplayParams);
break;
-#endif
}
}
« no previous file with comments | « tools/viewer/sk_app/Window.cpp ('k') | tools/viewer/sk_app/unix/GLWindowContext_unix.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698