summaryrefslogtreecommitdiffstats
path: root/opengl
diff options
context:
space:
mode:
authorJamie Gennis <jgennis@google.com>2011-11-21 21:08:21 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-21 21:08:21 -0800
commit07f062b6271e7ec820d1079566e7451a9cf55558 (patch)
tree57d9f1caf0e0ab9ed8d13a00f1391bdb7823edf7 /opengl
parent53d42cb7d3c5c35b63363abbe9c44b8f6961afd4 (diff)
parentc25972950c2ea62fb085524dbe737c2bf0f08f4a (diff)
downloadframeworks_base-07f062b6271e7ec820d1079566e7451a9cf55558.zip
frameworks_base-07f062b6271e7ec820d1079566e7451a9cf55558.tar.gz
frameworks_base-07f062b6271e7ec820d1079566e7451a9cf55558.tar.bz2
am c2597295: am 53cf2020: Merge changes I37fd43b5,I91eb29db,I0491ce35 into ics-mr1
* commit 'c25972950c2ea62fb085524dbe737c2bf0f08f4a': SurfaceTexture: fix a couple tests EGL: default to swap interval 1 SurfaceTexture: clean up some tests
Diffstat (limited to 'opengl')
-rw-r--r--opengl/libs/EGL/eglApi.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index 2237eb6..a63d5b0 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -370,6 +370,11 @@ EGLSurface eglCreateWindowSurface( EGLDisplay dpy, EGLConfig config,
}
}
+ // the EGL spec requires that a new EGLSurface default to swap interval
+ // 1, so explicitly set that on the window here.
+ ANativeWindow* anw = reinterpret_cast<ANativeWindow*>(window);
+ anw->setSwapInterval(anw, 1);
+
EGLSurface surface = cnx->egl.eglCreateWindowSurface(
iDpy, iConfig, window, attrib_list);
if (surface != EGL_NO_SURFACE) {