summaryrefslogtreecommitdiffstats
path: root/opengl/tests
diff options
context:
space:
mode:
authorMathias Agopian <mathias@google.com>2010-06-09 19:57:01 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2010-06-09 19:57:01 -0700
commit533ca7b8f4cba6330ee1314f17b78274c96c12dc (patch)
tree075355077d147387daeca600451668a36aad15c0 /opengl/tests
parent0889adde3badac83d63fa462a68bb134a4a298df (diff)
parente52d66fa70e3ebcfe8544b91d2a08b92db1b1692 (diff)
downloadframeworks_base-533ca7b8f4cba6330ee1314f17b78274c96c12dc.zip
frameworks_base-533ca7b8f4cba6330ee1314f17b78274c96c12dc.tar.gz
frameworks_base-533ca7b8f4cba6330ee1314f17b78274c96c12dc.tar.bz2
am e52d66fa: am 44bea8f8: Merge changes I00274431,I83be9404,I0359531a,Iceef1e95 into kraken
Diffstat (limited to 'opengl/tests')
-rw-r--r--opengl/tests/gl2_basic/gl2_basic.cpp1
-rw-r--r--opengl/tests/gl_basic/gl_basic.cpp1
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),