AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add backend selection to viewer's GUI

Browse Source 
BUG=skia:

Change-Id: I3314013538792c2aa82cc49f3f072aab2cdc4a55
Reviewed-on: https://skia-review.googlesource.com/9079
Commit-Queue: Brian Osman <brianosman@google.com>
Reviewed-by: Jim Van Verth <jvanverth@google.com>
This commit is contained in:
Brian Osman 2017-02-28 15:45:01 -05:00 committed by Skia Commit-Bot
parent 5990680a09
commit 621491e07e
2 changed files with 52 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
tools/viewer/Viewer.cpp
View File

@ -353,46 +353,27 @@ Viewer::Viewer(int argc, char** argv, void* platformData)
fWindow->inval(); fWindow->inval();
}); });
fCommands.addCommand('d', "Modes", "Change rendering backend", [this]() { fCommands.addCommand('d', "Modes", "Change rendering backend", [this]() {
sk_app::Window::BackendType newBackend = fBackendType;
#if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_MAC) #if defined(SK_BUILD_FOR_WIN) || defined(SK_BUILD_FOR_MAC)
if (sk_app::Window::kRaster_BackendType == fBackendType) { if (sk_app::Window::kRaster_BackendType == fBackendType) {
fBackendType = sk_app::Window::kNativeGL_BackendType; newBackend = sk_app::Window::kNativeGL_BackendType;
#ifdef SK_VULKAN #ifdef SK_VULKAN
} else if (sk_app::Window::kNativeGL_BackendType == fBackendType) { } else if (sk_app::Window::kNativeGL_BackendType == fBackendType) {
fBackendType = sk_app::Window::kVulkan_BackendType; newBackend = sk_app::Window::kVulkan_BackendType;
#endif #endif
} else { } else {
fBackendType = sk_app::Window::kRaster_BackendType; newBackend = sk_app::Window::kRaster_BackendType;
} }
#elif defined(SK_BUILD_FOR_UNIX) #elif defined(SK_BUILD_FOR_UNIX)
// Switching to and from Vulkan is problematic on Linux so disabled for now // Switching to and from Vulkan is problematic on Linux so disabled for now
if (sk_app::Window::kRaster_BackendType == fBackendType) { if (sk_app::Window::kRaster_BackendType == fBackendType) {
fBackendType = sk_app::Window::kNativeGL_BackendType; newBackend = sk_app::Window::kNativeGL_BackendType;
} else if (sk_app::Window::kNativeGL_BackendType == fBackendType) { } else if (sk_app::Window::kNativeGL_BackendType == fBackendType) {
fBackendType = sk_app::Window::kRaster_BackendType; newBackend = sk_app::Window::kRaster_BackendType;
} }
#endif #endif
fWindow->detach();
#if defined(SK_BUILD_FOR_WIN) && defined(SK_VULKAN) this->setBackend(newBackend);
// Switching from OpenGL to Vulkan in the same window is problematic at this point on
// Windows, so we just delete the window and recreate it.
if (sk_app::Window::kVulkan_BackendType == fBackendType) {
delete fWindow;
fWindow = Window::CreateNativeWindow(nullptr);
// re-register callbacks
fCommands.attach(fWindow);
fWindow->registerBackendCreatedFunc(on_backend_created_func, this);
fWindow->registerPaintFunc(on_paint_handler, this);
fWindow->registerTouchFunc(on_touch_handler, this);
fWindow->registerUIStateChangedFunc(on_ui_state_changed_handler, this);
fWindow->registerMouseFunc(on_mouse_handler, this);
fWindow->registerMouseWheelFunc(on_mouse_wheel_handler, this);
fWindow->registerKeyFunc(on_key_handler, this);
fWindow->registerCharFunc(on_char_handler, this);
}
#endif
fWindow->attach(fBackendType);
}); });
// set up slides // set up slides
@ -684,6 +665,34 @@ SkMatrix Viewer::computeMatrix() {
return m; return m;
} }
void Viewer::setBackend(sk_app::Window::BackendType backendType) {
fBackendType = backendType;
fWindow->detach();
#if defined(SK_BUILD_FOR_WIN) && defined(SK_VULKAN)
// Switching from OpenGL to Vulkan in the same window is problematic at this point on
// Windows, so we just delete the window and recreate it.
if (sk_app::Window::kVulkan_BackendType == fBackendType) {
delete fWindow;
fWindow = Window::CreateNativeWindow(nullptr);
// re-register callbacks
fCommands.attach(fWindow);
fWindow->registerBackendCreatedFunc(on_backend_created_func, this);
fWindow->registerPaintFunc(on_paint_handler, this);
fWindow->registerTouchFunc(on_touch_handler, this);
fWindow->registerUIStateChangedFunc(on_ui_state_changed_handler, this);
fWindow->registerMouseFunc(on_mouse_handler, this);
fWindow->registerMouseWheelFunc(on_mouse_wheel_handler, this);
fWindow->registerKeyFunc(on_key_handler, this);
fWindow->registerCharFunc(on_char_handler, this);
}
#endif
fWindow->attach(fBackendType);
}
void Viewer::setColorMode(SkColorType colorType, bool colorManaged) { void Viewer::setColorMode(SkColorType colorType, bool colorManaged) {
fColorType = colorType; fColorType = colorType;
fColorManaged = colorManaged; fColorManaged = colorManaged;
@ -949,13 +958,28 @@ void Viewer::drawImGui(SkCanvas* canvas) {
ImGui::ShowTestWindow(&fShowImGuiTestWindow); ImGui::ShowTestWindow(&fShowImGuiTestWindow);
} }
SkPaint gamutImagePaint;
if (fShowImGuiDebugWindow) { if (fShowImGuiDebugWindow) {
// We have some dynamic content that sizes to fill available size. If the scroll bar isn't // We have some dynamic content that sizes to fill available size. If the scroll bar isn't
// always visible, we can end up in a layout feedback loop. // always visible, we can end up in a layout feedback loop.
ImGui::SetNextWindowSize(ImVec2(400, 400), ImGuiSetCond_FirstUseEver); ImGui::SetNextWindowSize(ImVec2(400, 400), ImGuiSetCond_FirstUseEver);
if (ImGui::Begin("Tools", &fShowImGuiDebugWindow, if (ImGui::Begin("Tools", &fShowImGuiDebugWindow,
ImGuiWindowFlags_AlwaysVerticalScrollbar)) { ImGuiWindowFlags_AlwaysVerticalScrollbar)) {
if (ImGui::CollapsingHeader("Backend")) {
int newBackend = static_cast<int>(fBackendType);
ImGui::RadioButton("Raster", &newBackend, sk_app::Window::kRaster_BackendType);
ImGui::SameLine();
ImGui::RadioButton("OpenGL", &newBackend, sk_app::Window::kNativeGL_BackendType);
#if defined(SK_VULKAN)
ImGui::SameLine();
ImGui::RadioButton("Vulkan", &newBackend, sk_app::Window::kVulkan_BackendType);
#endif
if (newBackend != fBackendType) {
fDeferredActions.push_back([=]() {
this->setBackend(static_cast<sk_app::Window::BackendType>(newBackend));
});
}
}
if (ImGui::CollapsingHeader("Slide")) { if (ImGui::CollapsingHeader("Slide")) {
static ImGuiTextFilter filter; static ImGuiTextFilter filter;
filter.Draw(); filter.Draw();

1
tools/viewer/Viewer.h
View File

@ -34,6 +34,7 @@ public:
private: private:
void initSlides(); void initSlides();
void updateTitle(); void updateTitle();
void setBackend(sk_app::Window::BackendType);
void setColorMode(SkColorType, bool colorManaged); void setColorMode(SkColorType, bool colorManaged);
void setStartupSlide(); void setStartupSlide();
void setupCurrentSlide(int previousSlide); void setupCurrentSlide(int previousSlide);