diff options
author | Jamie Gennis <jgennis@google.com> | 2012-09-24 18:23:05 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-24 18:23:05 -0700 |
commit | 483ab74243870e6af4b8a947873556ff86d076c0 (patch) | |
tree | 4d64114b2907e6db50be30fa68a845f164bdb755 | |
parent | ca5f79c2bb6c2e3995d9e2427f2600d1b03a84c4 (diff) | |
parent | 2f45d7464a55d7a91da6fcd6f8cf1b11e395d029 (diff) | |
download | frameworks_native-483ab74243870e6af4b8a947873556ff86d076c0.zip frameworks_native-483ab74243870e6af4b8a947873556ff86d076c0.tar.gz frameworks_native-483ab74243870e6af4b8a947873556ff86d076c0.tar.bz2 |
am 2f45d746: Merge "EGL: add the EGL_ANDROID_framebuffer_target enum" into jb-mr1-dev
* commit '2f45d7464a55d7a91da6fcd6f8cf1b11e395d029':
EGL: add the EGL_ANDROID_framebuffer_target enum
-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 |