Index: ui/gl/gl_surface_egl.cc |
diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc |
index 3fda8e7b97f7220257b7808af2064e80b34a0e53..eaf01ad10676c78017daa13909ee9abaff1052e6 100644 |
--- a/ui/gl/gl_surface_egl.cc |
+++ b/ui/gl/gl_surface_egl.cc |
@@ -172,10 +172,6 @@ NativeViewGLSurfaceEGL::NativeViewGLSurfaceEGL(bool software, |
} |
bool NativeViewGLSurfaceEGL::Initialize() { |
-#if defined(OS_ANDROID) |
- NOTREACHED(); |
- return false; |
-#else |
DCHECK(!surface_); |
if (!GetDisplay()) { |
@@ -184,7 +180,9 @@ bool NativeViewGLSurfaceEGL::Initialize() { |
} |
static const EGLint egl_window_attributes_sub_buffer[] = { |
+#if defined(EGL_NV_post_sub_buffer) |
no sievers
2012/07/20 20:31:59
Is this good?
This is not defined in the Android S
piman
2012/07/20 20:44:08
bleh... we have 3 sets of includes: the ones in th
no sievers
2012/07/20 21:11:06
Word. Especially, since this file is explicit abou
|
EGL_POST_SUB_BUFFER_SUPPORTED_NV, EGL_TRUE, |
+#endif |
EGL_NONE |
}; |
@@ -203,15 +201,16 @@ bool NativeViewGLSurfaceEGL::Initialize() { |
return false; |
} |
+#if defined(EGL_NV_post_sub_buffer) |
EGLint surfaceVal; |
EGLBoolean retVal = eglQuerySurface(GetDisplay(), |
surface_, |
EGL_POST_SUB_BUFFER_SUPPORTED_NV, |
&surfaceVal); |
supports_post_sub_buffer_ = (surfaceVal && retVal) == EGL_TRUE; |
+#endif |
return true; |
-#endif |
} |
void NativeViewGLSurfaceEGL::Destroy() { |