diff options
Diffstat (limited to 'tools/viewer/sk_app')
-rw-r--r-- | tools/viewer/sk_app/Window.cpp | 2 | ||||
-rw-r--r-- | tools/viewer/sk_app/Window.h | 2 | ||||
-rw-r--r-- | tools/viewer/sk_app/android/Window_android.cpp | 6 | ||||
-rw-r--r-- | tools/viewer/sk_app/unix/GLWindowContext_unix.cpp | 1 | ||||
-rw-r--r-- | tools/viewer/sk_app/unix/Window_unix.cpp | 5 | ||||
-rw-r--r-- | tools/viewer/sk_app/win/Window_win.cpp | 5 |
6 files changed, 5 insertions, 16 deletions
diff --git a/tools/viewer/sk_app/Window.cpp b/tools/viewer/sk_app/Window.cpp index 9d514f0865..7ec8baae36 100644 --- a/tools/viewer/sk_app/Window.cpp +++ b/tools/viewer/sk_app/Window.cpp @@ -9,7 +9,7 @@ #include "SkSurface.h" #include "SkCanvas.h" -#include "WindowContext.h" +#include "VulkanWindowContext.h" namespace sk_app { diff --git a/tools/viewer/sk_app/Window.h b/tools/viewer/sk_app/Window.h index a68cbbbb8e..8b1378a80f 100644 --- a/tools/viewer/sk_app/Window.h +++ b/tools/viewer/sk_app/Window.h @@ -41,9 +41,7 @@ public: enum BackendType { kNativeGL_BackendType, -#ifdef SK_VULKAN kVulkan_BackendType, -#endif kRaster_BackendType, kLast_BackendType = kRaster_BackendType diff --git a/tools/viewer/sk_app/android/Window_android.cpp b/tools/viewer/sk_app/android/Window_android.cpp index 60d89eb3ec..94ba9b00df 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 @@ void Window_android::initDisplay(ANativeWindow* window) { 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 } } diff --git a/tools/viewer/sk_app/unix/GLWindowContext_unix.cpp b/tools/viewer/sk_app/unix/GLWindowContext_unix.cpp index cde1eb2b5c..19f9731f52 100644 --- a/tools/viewer/sk_app/unix/GLWindowContext_unix.cpp +++ b/tools/viewer/sk_app/unix/GLWindowContext_unix.cpp @@ -90,6 +90,7 @@ void GLWindowContext_unix::onDestroyContext() { void GLWindowContext_unix::onSwapBuffers() { if (fDisplay && fGLContext) { + printf("swapping\n"); glXSwapBuffers(fDisplay, fWindow); } } diff --git a/tools/viewer/sk_app/unix/Window_unix.cpp b/tools/viewer/sk_app/unix/Window_unix.cpp index c4729263ec..431f156491 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 @@ bool Window_unix::attach(BackendType attachType, const DisplayParams& params) { 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); diff --git a/tools/viewer/sk_app/win/Window_win.cpp b/tools/viewer/sk_app/win/Window_win.cpp index 03537caa45..f9762a8787 100644 --- a/tools/viewer/sk_app/win/Window_win.cpp +++ b/tools/viewer/sk_app/win/Window_win.cpp @@ -13,9 +13,7 @@ #include "SkUtils.h" #include "../GLWindowContext.h" -#ifdef SK_VULKAN #include "../VulkanWindowContext.h" -#endif namespace sk_app { @@ -277,11 +275,10 @@ bool Window_win::attach(BackendType attachType, const DisplayParams& params) { default: fWindowContext = GLWindowContext::Create((void*)&platformData, params); break; -#ifdef SK_VULKAN + case kVulkan_BackendType: fWindowContext = VulkanWindowContext::Create((void*)&platformData, params); break; -#endif } return (SkToBool(fWindowContext)); |