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

Unified Diff: tools/viewer/Viewer.cpp

Issue 1990893002: Revert of Add OpenGL context to Viewer. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 4 years, 7 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/Viewer.h ('k') | tools/viewer/sk_app/DisplayParams.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools/viewer/Viewer.cpp
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp
index 644dd22e5e92723be0a6305ef0af80e21e3dd1e5..7dd265e6e2183cd75c4e726410be8a845aa12d41 100644
--- a/tools/viewer/Viewer.cpp
+++ b/tools/viewer/Viewer.cpp
@@ -41,15 +41,9 @@
"it is skipped unless some list entry starts with ~");
DEFINE_string(skps, "skps", "Directory to read skps from.");
-const char *kBackendTypeStrings[sk_app::Window::kBackendTypeCount] = {
- " [OpenGL]",
- " [Vulkan]"
-};
-
Viewer::Viewer(int argc, char** argv, void* platformData)
: fCurrentMeasurement(0)
, fDisplayStats(false)
- , fBackendType(sk_app::Window::kVulkan_BackendType)
, fZoomCenterX(0.0f)
, fZoomCenterY(0.0f)
, fZoomLevel(0.0f)
@@ -66,7 +60,7 @@
SkCommandLineFlags::Parse(argc, argv);
fWindow = Window::CreateNativeWindow(platformData);
- fWindow->attach(fBackendType, DisplayParams());
+ fWindow->attach(Window::kVulkan_BackendType, DisplayParams());
// register callbacks
fCommands.attach(fWindow);
@@ -109,22 +103,6 @@
this->changeZoomLevel(-1.f / 32.f);
fWindow->inval();
});
-#ifndef SK_BUILD_FOR_ANDROID
- fCommands.addCommand('d', "Modes", "Change rendering backend", [this]() {
- fWindow->detach();
-
- if (sk_app::Window::kVulkan_BackendType == fBackendType) {
- fBackendType = sk_app::Window::kNativeGL_BackendType;
- }
- // TODO: get Vulkan -> OpenGL working without swapchain creation failure
- //else if (sk_app::Window::kNativeGL_BackendType == fBackendType) {
- // fBackendType = sk_app::Window::kVulkan_BackendType;
- //}
-
- fWindow->attach(fBackendType, DisplayParams());
- this->updateTitle();
- });
-#endif
// set up slides
this->initSlides();
@@ -201,7 +179,6 @@
if (kSRGB_SkColorProfileType == fWindow->getDisplayParams().fProfileType) {
title.append(" sRGB");
}
- title.append(kBackendTypeStrings[fBackendType]);
fWindow->setTitle(title.c_str());
}
@@ -256,6 +233,7 @@
}
void Viewer::onPaint(SkCanvas* canvas) {
+
int count = canvas->save();
if (fWindow->supportsContentRect()) {
« no previous file with comments | « tools/viewer/Viewer.h ('k') | tools/viewer/sk_app/DisplayParams.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698