diff options
| author |  bsalomon <bsalomon@google.com> | 2015-02-23 08:57:23 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-23 08:57:23 -0800 |
| commit | 42380174ca509e78ab932fa8c6dae953e1eaaa5a (patch) | |
| tree | fe233d7e7715e962fe0f8b6da2a85604d2c0ff7d /src/views/win/SkOSWindow_win.cpp | |
| parent | 332c729ceca3db4bde5b6382db5f67ba066ae48a (diff) | |
Use D3D11 backend for ANGLE when available.
Review URL: https://codereview.chromium.org/954453002
Diffstat (limited to 'src/views/win/SkOSWindow_win.cpp')
| -rw-r--r-- | src/views/win/SkOSWindow_win.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp index 315ac2b05a..08bbdd3a9e 100644 --- a/src/views/win/SkOSWindow_win.cpp +++ b/src/views/win/SkOSWindow_win.cpp @@ -21,8 +21,8 @@ #include "SkGraphics.h" #if SK_ANGLE +#include "gl/angle/SkANGLEGLContext.h" #include "gl/GrGLInterface.h" - #include "GLES2/gl2.h" #define ANGLE_GL_CALL(IFACE, X) \ @@ -384,6 +384,7 @@ void SkOSWindow::presentGL() { } #if SK_ANGLE + bool create_ANGLE(EGLNativeWindowType hWnd, int msaaSampleCount, EGLDisplay* eglDisplay, @@ -407,9 +408,11 @@ bool create_ANGLE(EGLNativeWindowType hWnd, EGL_NONE, EGL_NONE }; - EGLDisplay display = eglGetDisplay(GetDC(hWnd)); - if (display == EGL_NO_DISPLAY ) { - return false; + EGLDisplay display = SkANGLEGLContext::GetD3DEGLDisplay(GetDC(hWnd)); + + if (EGL_NO_DISPLAY == display) { + SkDebugf("Could not create ANGLE egl display!\n"); + return false; } // Initialize EGL |