diff options
| author |  Brian Osman <brianosman@google.com> | 2017-02-28 14:37:40 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-28 20:15:43 +0000 |
| commit | 585dba831c83447861c1977c2e4896d65d449858 (patch) | |
| tree | 4b6ecdb0c625c7ef138bf6cc3ba34ef544dd7e45 /tools | |
| parent | 6722553135613010b4dd6eac1b6f572cfa8aabe8 (diff) | |
Fix crash switching to Vulkan in viewer on Windows
BUG=skia:
Change-Id: I626aa6a1571311600a6208c42a8c3e9509d037de
Reviewed-on: https://skia-review.googlesource.com/9078
Reviewed-by: Jim Van Verth <jvanverth@google.com>
Commit-Queue: Brian Osman <brianosman@google.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/viewer/Viewer.cpp | 1 | ||||
| -rw-r--r-- | tools/viewer/sk_app/Window.cpp | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/viewer/Viewer.cpp b/tools/viewer/Viewer.cpp index 8789c99a56..bc99a31f84 100644 --- a/tools/viewer/Viewer.cpp +++ b/tools/viewer/Viewer.cpp @@ -382,6 +382,7 @@ Viewer::Viewer(int argc, char** argv, void* platformData) // 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); diff --git a/tools/viewer/sk_app/Window.cpp b/tools/viewer/sk_app/Window.cpp index a63e1e3760..12fb998ba7 100644 --- a/tools/viewer/sk_app/Window.cpp +++ b/tools/viewer/sk_app/Window.cpp @@ -13,6 +13,8 @@ namespace sk_app { +static void default_backend_created_func(void* userData) {} + static bool default_char_func(SkUnichar c, uint32_t modifiers, void* userData) { return false; } @@ -41,7 +43,8 @@ static void default_ui_state_changed_func( static void default_paint_func(SkCanvas*, void* userData) {} -Window::Window() : fCharFunc(default_char_func) +Window::Window() : fBackendCreatedFunc(default_backend_created_func) + , fCharFunc(default_char_func) , fKeyFunc(default_key_func) , fMouseFunc(default_mouse_func) , fMouseWheelFunc(default_mouse_wheel_func) |