diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 02:14:41 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-07-09 02:14:41 +0000 |
| commit | 7ef20595afcd007beede025fcdd03797f389370f (patch) | |
| tree | a56791001f191790ad5617a9abaf1fdb4cb0a846 /ui/gl/gl_image_egl.cc | |
| parent | 6fff31c28395494f26cd9bd93f78403ab14e37be (diff) | |
| download | chromium_src-7ef20595afcd007beede025fcdd03797f389370f.zip chromium_src-7ef20595afcd007beede025fcdd03797f389370f.tar.gz chromium_src-7ef20595afcd007beede025fcdd03797f389370f.tar.bz2 | |
Add command line switch and about:flags entry to enable use of D3D11 on Windows.
BUG=256863
Review URL: https://chromiumcodereview.appspot.com/18581003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210494 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl/gl_image_egl.cc')
| -rw-r--r-- | ui/gl/gl_image_egl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ui/gl/gl_image_egl.cc b/ui/gl/gl_image_egl.cc index f7f2889..c62971d 100644 --- a/ui/gl/gl_image_egl.cc +++ b/ui/gl/gl_image_egl.cc @@ -5,6 +5,7 @@ #include "ui/gl/gl_image_egl.h" #include "ui/gl/gl_bindings.h" +#include "ui/gl/gl_surface_egl.h" namespace gfx { @@ -24,7 +25,7 @@ bool GLImageEGL::Initialize(gfx::GpuMemoryBufferHandle buffer) { EGL_NONE, }; egl_image_ = eglCreateImageKHR( - eglGetDisplay(EGL_DEFAULT_DISPLAY), + GLSurfaceEGL::GetHardwareDisplay(), EGL_NO_CONTEXT, EGL_NATIVE_BUFFER_ANDROID, cbuf, @@ -63,7 +64,7 @@ void GLImageEGL::Destroy() { return; EGLBoolean success = eglDestroyImageKHR( - eglGetDisplay(EGL_DEFAULT_DISPLAY), egl_image_); + GLSurfaceEGL::GetHardwareDisplay(), egl_image_); if (success == EGL_FALSE) { EGLint error = eglGetError(); |