am 0cbb6c2b: Merge "Update egl/common.py"
* commit '0cbb6c2b13bf5cbd68f38fec6584efe28f49df68':
Update egl/common.py
diff --git a/framework/egl/wrapper/eglwEnums.inl b/framework/egl/wrapper/eglwEnums.inl
index a9f811b..2e8a460 100644
--- a/framework/egl/wrapper/eglwEnums.inl
+++ b/framework/egl/wrapper/eglwEnums.inl
@@ -222,6 +222,8 @@
#define EGL_SYNC_CL_EVENT 0x30FE
#define EGL_SYNC_CL_EVENT_COMPLETE 0x30FF
#define EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT 0x3138
+#define EGL_BUFFER_AGE_KHR 0x313D
+#define EGL_BUFFER_AGE_EXT 0x313D
#define EGL_NATIVE_BUFFER_ANDROID 0x3140
#define EGL_CONTEXT_OPENGL_DEBUG 0x31B0
#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE 0x31B1
diff --git a/framework/egl/wrapper/eglwFuncPtrLibraryDecl.inl b/framework/egl/wrapper/eglwFuncPtrLibraryDecl.inl
index 24dd7b8..b65985c 100644
--- a/framework/egl/wrapper/eglwFuncPtrLibraryDecl.inl
+++ b/framework/egl/wrapper/eglwFuncPtrLibraryDecl.inl
@@ -49,9 +49,11 @@
EGLBoolean querySurface (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value) const;
EGLBoolean releaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer) const;
EGLBoolean releaseThread (void) const;
+EGLBoolean setDamageRegionKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects) const;
EGLBoolean signalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) const;
EGLBoolean surfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value) const;
EGLBoolean swapBuffers (EGLDisplay dpy, EGLSurface surface) const;
+EGLBoolean swapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects) const;
EGLBoolean swapInterval (EGLDisplay dpy, EGLint interval) const;
EGLBoolean terminate (EGLDisplay dpy) const;
EGLBoolean unlockSurfaceKHR (EGLDisplay dpy, EGLSurface surface) const;
diff --git a/framework/egl/wrapper/eglwFuncPtrLibraryImpl.inl b/framework/egl/wrapper/eglwFuncPtrLibraryImpl.inl
index 0734bd7..007b950 100644
--- a/framework/egl/wrapper/eglwFuncPtrLibraryImpl.inl
+++ b/framework/egl/wrapper/eglwFuncPtrLibraryImpl.inl
@@ -234,6 +234,11 @@
return m_egl.releaseThread();
}
+EGLBoolean FuncPtrLibrary::setDamageRegionKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects) const
+{
+ return m_egl.setDamageRegionKHR(dpy, surface, rects, n_rects);
+}
+
EGLBoolean FuncPtrLibrary::signalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) const
{
return m_egl.signalSyncKHR(dpy, sync, mode);
@@ -249,6 +254,11 @@
return m_egl.swapBuffers(dpy, surface);
}
+EGLBoolean FuncPtrLibrary::swapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects) const
+{
+ return m_egl.swapBuffersWithDamageKHR(dpy, surface, rects, n_rects);
+}
+
EGLBoolean FuncPtrLibrary::swapInterval (EGLDisplay dpy, EGLint interval) const
{
return m_egl.swapInterval(dpy, interval);
diff --git a/framework/egl/wrapper/eglwFunctionTypes.inl b/framework/egl/wrapper/eglwFunctionTypes.inl
index 9b2a87f..e02039a 100644
--- a/framework/egl/wrapper/eglwFunctionTypes.inl
+++ b/framework/egl/wrapper/eglwFunctionTypes.inl
@@ -49,9 +49,11 @@
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglQuerySurfaceFunc) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglReleaseTexImageFunc) (EGLDisplay dpy, EGLSurface surface, EGLint buffer);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglReleaseThreadFunc) (void);
+typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglSetDamageRegionKHRFunc) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglSignalSyncKHRFunc) (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglSurfaceAttribFunc) (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglSwapBuffersFunc) (EGLDisplay dpy, EGLSurface surface);
+typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglSwapBuffersWithDamageKHRFunc) (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglSwapIntervalFunc) (EGLDisplay dpy, EGLint interval);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglTerminateFunc) (EGLDisplay dpy);
typedef EGLW_APICALL EGLBoolean (EGLW_APIENTRY* eglUnlockSurfaceKHRFunc) (EGLDisplay dpy, EGLSurface surface);
diff --git a/framework/egl/wrapper/eglwFunctions.inl b/framework/egl/wrapper/eglwFunctions.inl
index 0d2621f..3ea39ba 100644
--- a/framework/egl/wrapper/eglwFunctions.inl
+++ b/framework/egl/wrapper/eglwFunctions.inl
@@ -49,9 +49,11 @@
eglQuerySurfaceFunc querySurface;
eglReleaseTexImageFunc releaseTexImage;
eglReleaseThreadFunc releaseThread;
+eglSetDamageRegionKHRFunc setDamageRegionKHR;
eglSignalSyncKHRFunc signalSyncKHR;
eglSurfaceAttribFunc surfaceAttrib;
eglSwapBuffersFunc swapBuffers;
+eglSwapBuffersWithDamageKHRFunc swapBuffersWithDamageKHR;
eglSwapIntervalFunc swapInterval;
eglTerminateFunc terminate;
eglUnlockSurfaceKHRFunc unlockSurfaceKHR;
diff --git a/framework/egl/wrapper/eglwInitExtensions.inl b/framework/egl/wrapper/eglwInitExtensions.inl
index b492874..9488633 100644
--- a/framework/egl/wrapper/eglwInitExtensions.inl
+++ b/framework/egl/wrapper/eglwInitExtensions.inl
@@ -13,6 +13,8 @@
dst->getPlatformDisplayEXT = (eglGetPlatformDisplayEXTFunc) loader->get("eglGetPlatformDisplayEXT");
dst->getSyncAttribKHR = (eglGetSyncAttribKHRFunc) loader->get("eglGetSyncAttribKHR");
dst->lockSurfaceKHR = (eglLockSurfaceKHRFunc) loader->get("eglLockSurfaceKHR");
+dst->setDamageRegionKHR = (eglSetDamageRegionKHRFunc) loader->get("eglSetDamageRegionKHR");
dst->signalSyncKHR = (eglSignalSyncKHRFunc) loader->get("eglSignalSyncKHR");
+dst->swapBuffersWithDamageKHR = (eglSwapBuffersWithDamageKHRFunc) loader->get("eglSwapBuffersWithDamageKHR");
dst->unlockSurfaceKHR = (eglUnlockSurfaceKHRFunc) loader->get("eglUnlockSurfaceKHR");
dst->waitSyncKHR = (eglWaitSyncKHRFunc) loader->get("eglWaitSyncKHR");
diff --git a/framework/egl/wrapper/eglwLibrary.inl b/framework/egl/wrapper/eglwLibrary.inl
index eadfe2a..d46e459 100644
--- a/framework/egl/wrapper/eglwLibrary.inl
+++ b/framework/egl/wrapper/eglwLibrary.inl
@@ -49,9 +49,11 @@
virtual EGLBoolean querySurface (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value) const = 0;
virtual EGLBoolean releaseTexImage (EGLDisplay dpy, EGLSurface surface, EGLint buffer) const = 0;
virtual EGLBoolean releaseThread (void) const = 0;
+virtual EGLBoolean setDamageRegionKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects) const = 0;
virtual EGLBoolean signalSyncKHR (EGLDisplay dpy, EGLSyncKHR sync, EGLenum mode) const = 0;
virtual EGLBoolean surfaceAttrib (EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value) const = 0;
virtual EGLBoolean swapBuffers (EGLDisplay dpy, EGLSurface surface) const = 0;
+virtual EGLBoolean swapBuffersWithDamageKHR (EGLDisplay dpy, EGLSurface surface, EGLint *rects, EGLint n_rects) const = 0;
virtual EGLBoolean swapInterval (EGLDisplay dpy, EGLint interval) const = 0;
virtual EGLBoolean terminate (EGLDisplay dpy) const = 0;
virtual EGLBoolean unlockSurfaceKHR (EGLDisplay dpy, EGLSurface surface) const = 0;
diff --git a/scripts/egl/common.py b/scripts/egl/common.py
index 1105c4f..64690dd 100644
--- a/scripts/egl/common.py
+++ b/scripts/egl/common.py
@@ -60,7 +60,10 @@
"EGL_EXT_platform_base",
"EGL_EXT_platform_x11",
"EGL_ANDROID_image_native_buffer",
- "EGL_EXT_yuv_surface"
+ "EGL_EXT_yuv_surface",
+ "EGL_EXT_buffer_age",
+ "EGL_KHR_partial_update",
+ "EGL_KHR_swap_buffers_with_damage"
]
PROTECTS = [
"KHRONOS_SUPPORT_INT64"