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

Unified Diff: src/views/win/SkOSWindow_win.cpp

Issue 954453002: Use D3D11 backend for ANGLE when available. (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: whitespace Created 5 years, 10 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 | « src/gpu/gl/angle/SkANGLEGLContext.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/views/win/SkOSWindow_win.cpp
diff --git a/src/views/win/SkOSWindow_win.cpp b/src/views/win/SkOSWindow_win.cpp
index 315ac2b05ac2b95c24f2de82152475c8f149d1e3..08bbdd3a9ef3e391111f7590f281351c942fd4e1 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
« no previous file with comments | « src/gpu/gl/angle/SkANGLEGLContext.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698