diff options
| author | Mathias Agopian <mathias@google.com> | 2010-06-09 19:54:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2010-06-09 19:54:29 -0700 |
| commit | bb84a96accb5c3962bd1af27a8d559614b9ab77f (patch) | |
| tree | 92e39b1556b048c8752a5b6c1075491ed5ab4a96 /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | b4f689e6d576bade4756742dd16921238c24c061 (diff) | |
| parent | e81a3cb2bd16f0ce1e9c256559aaa2095a1f41f6 (diff) | |
Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
* changes:
update EGL headers to the latest
update GL ES stub libraries with the new GL ES headers
fix OpenGL ES extension headers from khronos
update the OpenGL ES headers to the latest
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
| -rw-r--r-- | opengl/tests/gl_basic/gl_basic.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/opengl/tests/gl_basic/gl_basic.cpp b/opengl/tests/gl_basic/gl_basic.cpp index feb964a151..0cc8398a4a 100644 --- a/opengl/tests/gl_basic/gl_basic.cpp +++ b/opengl/tests/gl_basic/gl_basic.cpp @@ -114,7 +114,6 @@ void printEGLConfiguration(EGLDisplay dpy, EGLConfig config) { X(EGL_NATIVE_RENDERABLE), X(EGL_NATIVE_VISUAL_ID), X(EGL_NATIVE_VISUAL_TYPE), - X(EGL_PRESERVED_RESOURCES), X(EGL_SAMPLES), X(EGL_SAMPLE_BUFFERS), X(EGL_SURFACE_TYPE), |