diff options
| author | Jamie Gennis <jgennis@google.com> | 2012-09-24 18:21:13 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-09-24 18:21:14 -0700 |
| commit | 2f45d7464a55d7a91da6fcd6f8cf1b11e395d029 (patch) | |
| tree | f9eabec7e9aca9cd9b75d5e00f95b60745871f2e /opengl | |
| parent | 363847d498bffe0e2d8e7b8aba693bb402513413 (diff) | |
| parent | 3ff48e5e69955b37292446c0f2ac98e8238bdaca (diff) | |
| download | frameworks_native-2f45d7464a55d7a91da6fcd6f8cf1b11e395d029.zip frameworks_native-2f45d7464a55d7a91da6fcd6f8cf1b11e395d029.tar.gz frameworks_native-2f45d7464a55d7a91da6fcd6f8cf1b11e395d029.tar.bz2 | |
Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/include/EGL/eglext.h | 7 | ||||
| -rw-r--r-- | opengl/libs/EGL/egl_display.cpp | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h index 3348039..8578874 100644 --- a/opengl/include/EGL/eglext.h +++ b/opengl/include/EGL/eglext.h @@ -304,6 +304,13 @@ EGLAPI EGLint EGLAPIENTRY eglWaitSyncANDROID(EGLDisplay dpy, EGLSyncKHR sync, EG typedef EGLint (EGLAPIENTRYP PFNEGLWAITSYNCANDROID) (EGLDisplay dpy, EGLSyncKHR sync, EGLint flags); #endif +/* EGL_ANDROID_framebuffer_target + */ +#ifndef EGL_ANDROID_framebuffer_target +#define EGL_ANDROID_framebuffer_target +#define EGL_FRAMEBUFFER_TARGET_ANDROID 0x3147 +#endif + #ifdef __cplusplus } #endif diff --git a/opengl/libs/EGL/egl_display.cpp b/opengl/libs/EGL/egl_display.cpp index 8fd5af1..7ca9e40 100644 --- a/opengl/libs/EGL/egl_display.cpp +++ b/opengl/libs/EGL/egl_display.cpp @@ -59,6 +59,7 @@ static char const * const sExtensionString = // extensions not exposed to applications but used by the ANDROID system // "EGL_ANDROID_recordable " // mandatory +// "EGL_ANDROID_framebuffer_target " // mandatory for HWC 1.1 // "EGL_ANDROID_blob_cache " // strongly recommended // "EGL_ANDROID_native_fence_sync " // strongly recommended // "EGL_IMG_hibernate_process " // optional |