am 483ab742: am 2f45d746: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev

* commit '483ab74243870e6af4b8a947873556ff86d076c0':
  EGL: add the EGL_ANDROID_framebuffer_target enum
This commit is contained in:
Jamie Gennis 2012-09-24 18:25:05 -07:00 committed by Android Git Automerger
commit 651d23e6f7
2 changed files with 8 additions and 0 deletions

View File

@ -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

View File

@ -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