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

Unified Diff: tools/viewer/sk_app/unix/Window_unix.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/unix/GLWindowContext_unix.cpp ('k') | tools/viewer/sk_app/win/Window_win.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/viewer/sk_app/unix/Window_unix.cpp
diff --git a/tools/viewer/sk_app/unix/Window_unix.cpp b/tools/viewer/sk_app/unix/Window_unix.cpp
index c4729263eca9a144cc1419e815d45ebb5c0b6f3b..431f1564911d5b752c91cc4ecbf6c1256b550c21 100644
--- a/tools/viewer/sk_app/unix/Window_unix.cpp
+++ b/tools/viewer/sk_app/unix/Window_unix.cpp
@@ -10,9 +10,7 @@
#include "SkUtils.h"
#include "Timer.h"
#include "../GLWindowContext.h"
-#ifdef SK_VULKAN
#include "../VulkanWindowContext.h"
-#endif
#include "Window_unix.h"
extern "C" {
@@ -278,11 +276,10 @@
platformData.fWindow = fWindow;
platformData.fVisualInfo = fVisualInfo;
switch (attachType) {
-#ifdef SK_VULKAN
case kVulkan_BackendType:
fWindowContext = VulkanWindowContext::Create((void*)&platformData, params);
break;
-#endif
+
case kNativeGL_BackendType:
default:
fWindowContext = GLWindowContext::Create((void*)&platformData, params);
« no previous file with comments | « tools/viewer/sk_app/unix/GLWindowContext_unix.cpp ('k') | tools/viewer/sk_app/win/Window_win.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698