Revert of Enable viewer in non-Vulkan builds (patchset #2 id:20001 of https://codereview.chromium.org/2067023002/ )
Reason for revert:
breaking compile bots
Original issue's description:
> Enable viewer in non-Vulkan builds
>
> BUG=skia:
> GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=2067023002
>
> Committed: https://skia.googlesource.com/skia/+/746b792a9aad1230ab69158a51c49b2e5437d95b
TBR=djsollen@google.com,jvanverth@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review-Url: https://codereview.chromium.org/2072563002
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index f44e1aa..7052a3a 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -66,9 +66,7 @@
const char *kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = {
" [OpenGL]",
-#ifdef SK_VULKAN
" [Vulkan]",
-#endif
" [Raster]"
};
@@ -88,7 +86,7 @@
: 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)
@@ -104,10 +102,9 @@
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());
diff --git a/tools/viewer/sk_app/Window.cpp b/tools/viewer/sk_app/Window.cpp
index 9d514f0..7ec8baa 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 a68cbbb..8b1378a 100644
--- a/tools/viewer/sk_app/Window.h
+++ b/tools/viewer/sk_app/Window.h
@@ -41,9 +41,7 @@
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 60d89eb..94ba9b0 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
}
}
diff --git a/tools/viewer/sk_app/unix/GLWindowContext_unix.cpp b/tools/viewer/sk_app/unix/GLWindowContext_unix.cpp
index cde1eb2..19f9731 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::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 c472926..431f156 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);
diff --git a/tools/viewer/sk_app/win/Window_win.cpp b/tools/viewer/sk_app/win/Window_win.cpp
index 03537ca..f9762a8 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 @@
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));