diff options
author | jvanverth <jvanverth@google.com> | 2016-05-20 06:01:06 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-20 06:01:06 -0700 |
commit | af236b5aa9e7d71d59bee6533d16deb76e9d098b (patch) | |
tree | f7eadc814062f1fc91325428c3ec604db64574a1 /tools/viewer/sk_app/win/Window_win.cpp | |
parent | d88b0bec43fdd6ef2f32c6e5a3e834d708ce76a7 (diff) |
Add OpenGL context to Viewer.
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1978573003
Committed: https://skia.googlesource.com/skia/+/56a11e4d6f3d436a3c2497c9c9e71a117d78a93f
Review-Url: https://codereview.chromium.org/1978573003
Diffstat (limited to 'tools/viewer/sk_app/win/Window_win.cpp')
-rw-r--r-- | tools/viewer/sk_app/win/Window_win.cpp | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/tools/viewer/sk_app/win/Window_win.cpp b/tools/viewer/sk_app/win/Window_win.cpp index 241a41caba..8355c7295a 100644 --- a/tools/viewer/sk_app/win/Window_win.cpp +++ b/tools/viewer/sk_app/win/Window_win.cpp @@ -12,7 +12,8 @@ #include <windowsx.h> #include "SkUtils.h" -#include "VulkanWindowContext_win.h" +#include "../GLWindowContext.h" +#include "../VulkanWindowContext.h" namespace sk_app { @@ -264,16 +265,21 @@ void Window_win::show() { } -bool Window_win::attach(BackEndType attachType, const DisplayParams& params) { - if (kVulkan_BackendType != attachType) { - return false; - } - +bool Window_win::attach(BackendType attachType, const DisplayParams& params) { ContextPlatformData_win platformData; platformData.fHInstance = fHInstance; platformData.fHWnd = fHWnd; - fWindowContext = VulkanWindowContext::Create((void*)&platformData, params); + switch (attachType) { + case kNativeGL_BackendType: + default: + fWindowContext = GLWindowContext::Create((void*)&platformData, params); + break; + + case kVulkan_BackendType: + fWindowContext = VulkanWindowContext::Create((void*)&platformData, params); + break; + } return (SkToBool(fWindowContext)); } |