diff options
| author | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 23:50:07 +0000 |
|---|---|---|
| committer | kaanb@chromium.org <kaanb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-09 23:50:07 +0000 |
| commit | 165f23d4cade36ca752779af372c92bdc749fb96 (patch) | |
| tree | 30d43fa2572c9aa0272af27211c134efc950843e /ui/gl | |
| parent | 469688dff7e0ff37a5dedb28c561befa008bd7a0 (diff) | |
| download | chromium_src-165f23d4cade36ca752779af372c92bdc749fb96.zip chromium_src-165f23d4cade36ca752779af372c92bdc749fb96.tar.gz chromium_src-165f23d4cade36ca752779af372c92bdc749fb96.tar.bz2 | |
-Move #define for EGL_BUFFER_NATIVE_ANDROID within gl_bindings.h
BUG=227205
Review URL: https://chromiumcodereview.appspot.com/13888002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193264 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/gl_bindings.h | 5 | ||||
| -rw-r--r-- | ui/gl/gl_image_egl.cc | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/ui/gl/gl_bindings.h b/ui/gl/gl_bindings.h index 9ee67dd..e7bd808 100644 --- a/ui/gl/gl_bindings.h +++ b/ui/gl/gl_bindings.h @@ -192,6 +192,11 @@ typedef void (*OSMESAproc)(); // Forward declare EGL types. typedef uint64 EGLuint64CHROMIUM; +#ifndef EGL_ANDROID_image_native_buffer +#define EGL_ANDROID_image_native_buffer 1 +#define EGL_NATIVE_BUFFER_ANDROID 0x3140 +#endif + #include "gl_bindings_autogen_gl.h" #include "gl_bindings_autogen_osmesa.h" diff --git a/ui/gl/gl_image_egl.cc b/ui/gl/gl_image_egl.cc index 74193f26..f7f2889 100644 --- a/ui/gl/gl_image_egl.cc +++ b/ui/gl/gl_image_egl.cc @@ -6,9 +6,6 @@ #include "ui/gl/gl_bindings.h" -// TODO(kaanb): remove when crbug.com/227205 is fixed. -#define EGL_NATIVE_BUFFER_ANDROID 0x3140 - namespace gfx { GLImageEGL::GLImageEGL(gfx::Size size) |