Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 483ab742 authored by Jamie Gennis's avatar Jamie Gennis Committed by Android Git Automerger
Browse files

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

* commit '2f45d746':
  EGL: add the EGL_ANDROID_framebuffer_target enum
parents ca5f79c2 2f45d746

opengl/include/EGL/eglext.h

+7 −0
Original line number Diff line number Diff line
@@ -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

opengl/libs/EGL/egl_display.cpp

+1 −0
Original line number Diff line number Diff line
@@ -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