diff options
| author | Mathias Agopian <mathias@google.com> | 2010-06-09 19:55:57 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-06-09 19:55:57 -0700 |
| commit | e52d66fa70e3ebcfe8544b91d2a08b92db1b1692 (patch) | |
| tree | 220695acc2c9075cad027dcab460ba6c1cf37e81 /opengl/tests | |
| parent | 030b0ebebf74510684189ac0f077b02be48f90f2 (diff) | |
| parent | 44bea8f803550e42111cb8b4c6e39d77354dae3c (diff) | |
| download | frameworks_base-e52d66fa70e3ebcfe8544b91d2a08b92db1b1692.zip frameworks_base-e52d66fa70e3ebcfe8544b91d2a08b92db1b1692.tar.gz frameworks_base-e52d66fa70e3ebcfe8544b91d2a08b92db1b1692.tar.bz2 | |
am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
Diffstat (limited to 'opengl/tests')
| -rw-r--r-- | opengl/tests/gl2_basic/gl2_basic.cpp | 1 | ||||
| -rw-r--r-- | opengl/tests/gl_basic/gl_basic.cpp | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/opengl/tests/gl2_basic/gl2_basic.cpp b/opengl/tests/gl2_basic/gl2_basic.cpp index 2361db5..f274c7c 100644 --- a/opengl/tests/gl2_basic/gl2_basic.cpp +++ b/opengl/tests/gl2_basic/gl2_basic.cpp @@ -195,7 +195,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), diff --git a/opengl/tests/gl_basic/gl_basic.cpp b/opengl/tests/gl_basic/gl_basic.cpp index feb964a..0cc8398 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), |