diff options
| author | Steve Kondik <shade@chemlab.org> | 2011-12-16 14:45:56 -0800 |
|---|---|---|
| committer | Steve Kondik <shade@chemlab.org> | 2011-12-16 14:45:56 -0800 |
| commit | bec96948c8ea41c022fe7e68ccdfdaa1a1128871 (patch) | |
| tree | d18f611794386ae7058f3a4b66e2c867bf14c70a /opengl/libagl | |
| parent | 7e350ef016b80203bc1b1c275729fe8c441a7728 (diff) | |
| parent | 8b6ed2d17d5e7e47944026679c9cba66611ab27f (diff) | |
| download | frameworks_base-bec96948c8ea41c022fe7e68ccdfdaa1a1128871.zip frameworks_base-bec96948c8ea41c022fe7e68ccdfdaa1a1128871.tar.gz frameworks_base-bec96948c8ea41c022fe7e68ccdfdaa1a1128871.tar.bz2 | |
Merge branch 'ics-mr1' of https://android.googlesource.com/platform/frameworks/base into aosp
Conflicts:
core/res/res/values/strings.xml
policy/src/com/android/internal/policy/impl/GlobalActions.java
services/java/com/android/server/WifiService.java
services/sensorservice/SensorDevice.cpp
telephony/java/com/android/internal/telephony/RIL.java
Change-Id: I89ec56d5ff282a2eb879ca40fb6d74ebcf752837
Diffstat (limited to 'opengl/libagl')
| -rw-r--r-- | opengl/libagl/egl.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/opengl/libagl/egl.cpp b/opengl/libagl/egl.cpp index 03db8d7..6d4098c 100644 --- a/opengl/libagl/egl.cpp +++ b/opengl/libagl/egl.cpp @@ -49,6 +49,11 @@ #undef NELEM #define NELEM(x) (sizeof(x)/sizeof(*(x))) + +EGLBoolean EGLAPI eglSetSwapRectangleANDROID(EGLDisplay dpy, EGLSurface draw, + EGLint left, EGLint top, EGLint width, EGLint height); + + // ---------------------------------------------------------------------------- namespace android { // ---------------------------------------------------------------------------- |