am 6cc7a432: Merge "Change eglu callLogWrapper behavior"
* commit '6cc7a432dfb5a82782942805bcf640dcb670260b':
Change eglu callLogWrapper behavior
diff --git a/framework/egl/egluCallLogWrapper.inl b/framework/egl/egluCallLogWrapper.inl
index c09a4e7..fa4f5e7 100644
--- a/framework/egl/egluCallLogWrapper.inl
+++ b/framework/egl/egluCallLogWrapper.inl
@@ -49,6 +49,16 @@
return returnValue;
}
+eglw::EGLint CallLogWrapper::eglClientWaitSyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLint flags, eglw::EGLTimeKHR timeout)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglClientWaitSyncKHR(" << dpy << ", " << sync << ", " << flags << ", " << timeout << ");" << TestLog::EndMessage;
+ eglw::EGLint returnValue = m_egl.clientWaitSyncKHR(dpy, sync, flags, timeout);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << returnValue << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglCopyBuffers (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLNativePixmapType target)
{
if (m_enableLog)
@@ -79,6 +89,16 @@
return returnValue;
}
+eglw::EGLImageKHR CallLogWrapper::eglCreateImageKHR (eglw::EGLDisplay dpy, eglw::EGLContext ctx, eglw::EGLenum target, eglw::EGLClientBuffer buffer, const eglw::EGLint *attrib_list)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglCreateImageKHR(" << dpy << ", " << ctx << ", " << toHex(target) << ", " << toHex(buffer) << ", " << attrib_list << ");" << TestLog::EndMessage;
+ eglw::EGLImageKHR returnValue = m_egl.createImageKHR(dpy, ctx, target, buffer, attrib_list);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << returnValue << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLSurface CallLogWrapper::eglCreatePbufferFromClientBuffer (eglw::EGLDisplay dpy, eglw::EGLenum buftype, eglw::EGLClientBuffer buffer, eglw::EGLConfig config, const eglw::EGLint *attrib_list)
{
if (m_enableLog)
@@ -119,6 +139,16 @@
return returnValue;
}
+eglw::EGLSurface CallLogWrapper::eglCreatePlatformPixmapSurfaceEXT (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_pixmap, const eglw::EGLint *attrib_list)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglCreatePlatformPixmapSurfaceEXT(" << dpy << ", " << toHex(config) << ", " << native_pixmap << ", " << attrib_list << ");" << TestLog::EndMessage;
+ eglw::EGLSurface returnValue = m_egl.createPlatformPixmapSurfaceEXT(dpy, config, native_pixmap, attrib_list);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << toHex(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLSurface CallLogWrapper::eglCreatePlatformWindowSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_window, const eglw::EGLAttrib *attrib_list)
{
if (m_enableLog)
@@ -129,6 +159,16 @@
return returnValue;
}
+eglw::EGLSurface CallLogWrapper::eglCreatePlatformWindowSurfaceEXT (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_window, const eglw::EGLint *attrib_list)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglCreatePlatformWindowSurfaceEXT(" << dpy << ", " << toHex(config) << ", " << native_window << ", " << attrib_list << ");" << TestLog::EndMessage;
+ eglw::EGLSurface returnValue = m_egl.createPlatformWindowSurfaceEXT(dpy, config, native_window, attrib_list);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << toHex(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLSync CallLogWrapper::eglCreateSync (eglw::EGLDisplay dpy, eglw::EGLenum type, const eglw::EGLAttrib *attrib_list)
{
if (m_enableLog)
@@ -139,6 +179,16 @@
return returnValue;
}
+eglw::EGLSyncKHR CallLogWrapper::eglCreateSyncKHR (eglw::EGLDisplay dpy, eglw::EGLenum type, const eglw::EGLint *attrib_list)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglCreateSyncKHR(" << dpy << ", " << toHex(type) << ", " << attrib_list << ");" << TestLog::EndMessage;
+ eglw::EGLSyncKHR returnValue = m_egl.createSyncKHR(dpy, type, attrib_list);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << returnValue << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLSurface CallLogWrapper::eglCreateWindowSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, eglw::EGLNativeWindowType win, const eglw::EGLint *attrib_list)
{
if (m_enableLog)
@@ -169,6 +219,16 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglDestroyImageKHR (eglw::EGLDisplay dpy, eglw::EGLImageKHR image)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglDestroyImageKHR(" << dpy << ", " << image << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.destroyImageKHR(dpy, image);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglDestroySurface (eglw::EGLDisplay dpy, eglw::EGLSurface surface)
{
if (m_enableLog)
@@ -189,6 +249,16 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglDestroySyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglDestroySyncKHR(" << dpy << ", " << sync << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.destroySyncKHR(dpy, sync);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglGetConfigAttrib (eglw::EGLDisplay dpy, eglw::EGLConfig config, eglw::EGLint attribute, eglw::EGLint *value)
{
if (m_enableLog)
@@ -273,6 +343,16 @@
return returnValue;
}
+eglw::EGLDisplay CallLogWrapper::eglGetPlatformDisplayEXT (eglw::EGLenum platform, void *native_display, const eglw::EGLint *attrib_list)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglGetPlatformDisplayEXT(" << toHex(platform) << ", " << native_display << ", " << attrib_list << ");" << TestLog::EndMessage;
+ eglw::EGLDisplay returnValue = m_egl.getPlatformDisplayEXT(platform, native_display, attrib_list);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << returnValue << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::__eglMustCastToProperFunctionPointerType CallLogWrapper::eglGetProcAddress (const char *procname)
{
if (m_enableLog)
@@ -293,6 +373,16 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglGetSyncAttribKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLint attribute, eglw::EGLint *value)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglGetSyncAttribKHR(" << dpy << ", " << sync << ", " << attribute << ", " << value << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.getSyncAttribKHR(dpy, sync, attribute, value);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglInitialize (eglw::EGLDisplay dpy, eglw::EGLint *major, eglw::EGLint *minor)
{
if (m_enableLog)
@@ -303,6 +393,16 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglLockSurfaceKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface, const eglw::EGLint *attrib_list)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglLockSurfaceKHR(" << dpy << ", " << toHex(surface) << ", " << attrib_list << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.lockSurfaceKHR(dpy, surface, attrib_list);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglMakeCurrent (eglw::EGLDisplay dpy, eglw::EGLSurface draw, eglw::EGLSurface read, eglw::EGLContext ctx)
{
if (m_enableLog)
@@ -381,6 +481,26 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglSetDamageRegionKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint *rects, eglw::EGLint n_rects)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglSetDamageRegionKHR(" << dpy << ", " << toHex(surface) << ", " << rects << ", " << n_rects << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.setDamageRegionKHR(dpy, surface, rects, n_rects);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
+eglw::EGLBoolean CallLogWrapper::eglSignalSyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLenum mode)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglSignalSyncKHR(" << dpy << ", " << sync << ", " << toHex(mode) << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.signalSyncKHR(dpy, sync, mode);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglSurfaceAttrib (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint attribute, eglw::EGLint value)
{
if (m_enableLog)
@@ -401,6 +521,16 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglSwapBuffersWithDamageKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint *rects, eglw::EGLint n_rects)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglSwapBuffersWithDamageKHR(" << dpy << ", " << toHex(surface) << ", " << rects << ", " << n_rects << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.swapBuffersWithDamageKHR(dpy, surface, rects, n_rects);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglSwapInterval (eglw::EGLDisplay dpy, eglw::EGLint interval)
{
if (m_enableLog)
@@ -421,6 +551,16 @@
return returnValue;
}
+eglw::EGLBoolean CallLogWrapper::eglUnlockSurfaceKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglUnlockSurfaceKHR(" << dpy << ", " << toHex(surface) << ");" << TestLog::EndMessage;
+ eglw::EGLBoolean returnValue = m_egl.unlockSurfaceKHR(dpy, surface);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
+
eglw::EGLBoolean CallLogWrapper::eglWaitClient ()
{
if (m_enableLog)
@@ -460,3 +600,13 @@
m_log << TestLog::Message << "// " << getBooleanStr(returnValue) << " returned" << TestLog::EndMessage;
return returnValue;
}
+
+eglw::EGLint CallLogWrapper::eglWaitSyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLint flags)
+{
+ if (m_enableLog)
+ m_log << TestLog::Message << "eglWaitSyncKHR(" << dpy << ", " << sync << ", " << flags << ");" << TestLog::EndMessage;
+ eglw::EGLint returnValue = m_egl.waitSyncKHR(dpy, sync, flags);
+ if (m_enableLog)
+ m_log << TestLog::Message << "// " << returnValue << " returned" << TestLog::EndMessage;
+ return returnValue;
+}
diff --git a/framework/egl/egluCallLogWrapperApi.inl b/framework/egl/egluCallLogWrapperApi.inl
index 216a868..ba90ce8 100644
--- a/framework/egl/egluCallLogWrapperApi.inl
+++ b/framework/egl/egluCallLogWrapperApi.inl
@@ -7,20 +7,27 @@
eglw::EGLBoolean eglBindTexImage (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint buffer);
eglw::EGLBoolean eglChooseConfig (eglw::EGLDisplay dpy, const eglw::EGLint *attrib_list, eglw::EGLConfig *configs, eglw::EGLint config_size, eglw::EGLint *num_config);
eglw::EGLint eglClientWaitSync (eglw::EGLDisplay dpy, eglw::EGLSync sync, eglw::EGLint flags, eglw::EGLTime timeout);
+eglw::EGLint eglClientWaitSyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLint flags, eglw::EGLTimeKHR timeout);
eglw::EGLBoolean eglCopyBuffers (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLNativePixmapType target);
eglw::EGLContext eglCreateContext (eglw::EGLDisplay dpy, eglw::EGLConfig config, eglw::EGLContext share_context, const eglw::EGLint *attrib_list);
eglw::EGLImage eglCreateImage (eglw::EGLDisplay dpy, eglw::EGLContext ctx, eglw::EGLenum target, eglw::EGLClientBuffer buffer, const eglw::EGLAttrib *attrib_list);
+eglw::EGLImageKHR eglCreateImageKHR (eglw::EGLDisplay dpy, eglw::EGLContext ctx, eglw::EGLenum target, eglw::EGLClientBuffer buffer, const eglw::EGLint *attrib_list);
eglw::EGLSurface eglCreatePbufferFromClientBuffer (eglw::EGLDisplay dpy, eglw::EGLenum buftype, eglw::EGLClientBuffer buffer, eglw::EGLConfig config, const eglw::EGLint *attrib_list);
eglw::EGLSurface eglCreatePbufferSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, const eglw::EGLint *attrib_list);
eglw::EGLSurface eglCreatePixmapSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, eglw::EGLNativePixmapType pixmap, const eglw::EGLint *attrib_list);
eglw::EGLSurface eglCreatePlatformPixmapSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_pixmap, const eglw::EGLAttrib *attrib_list);
+eglw::EGLSurface eglCreatePlatformPixmapSurfaceEXT (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_pixmap, const eglw::EGLint *attrib_list);
eglw::EGLSurface eglCreatePlatformWindowSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_window, const eglw::EGLAttrib *attrib_list);
+eglw::EGLSurface eglCreatePlatformWindowSurfaceEXT (eglw::EGLDisplay dpy, eglw::EGLConfig config, void *native_window, const eglw::EGLint *attrib_list);
eglw::EGLSync eglCreateSync (eglw::EGLDisplay dpy, eglw::EGLenum type, const eglw::EGLAttrib *attrib_list);
+eglw::EGLSyncKHR eglCreateSyncKHR (eglw::EGLDisplay dpy, eglw::EGLenum type, const eglw::EGLint *attrib_list);
eglw::EGLSurface eglCreateWindowSurface (eglw::EGLDisplay dpy, eglw::EGLConfig config, eglw::EGLNativeWindowType win, const eglw::EGLint *attrib_list);
eglw::EGLBoolean eglDestroyContext (eglw::EGLDisplay dpy, eglw::EGLContext ctx);
eglw::EGLBoolean eglDestroyImage (eglw::EGLDisplay dpy, eglw::EGLImage image);
+eglw::EGLBoolean eglDestroyImageKHR (eglw::EGLDisplay dpy, eglw::EGLImageKHR image);
eglw::EGLBoolean eglDestroySurface (eglw::EGLDisplay dpy, eglw::EGLSurface surface);
eglw::EGLBoolean eglDestroySync (eglw::EGLDisplay dpy, eglw::EGLSync sync);
+eglw::EGLBoolean eglDestroySyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync);
eglw::EGLBoolean eglGetConfigAttrib (eglw::EGLDisplay dpy, eglw::EGLConfig config, eglw::EGLint attribute, eglw::EGLint *value);
eglw::EGLBoolean eglGetConfigs (eglw::EGLDisplay dpy, eglw::EGLConfig *configs, eglw::EGLint config_size, eglw::EGLint *num_config);
eglw::EGLContext eglGetCurrentContext (void);
@@ -29,9 +36,12 @@
eglw::EGLDisplay eglGetDisplay (eglw::EGLNativeDisplayType display_id);
eglw::EGLint eglGetError (void);
eglw::EGLDisplay eglGetPlatformDisplay (eglw::EGLenum platform, void *native_display, const eglw::EGLAttrib *attrib_list);
+eglw::EGLDisplay eglGetPlatformDisplayEXT (eglw::EGLenum platform, void *native_display, const eglw::EGLint *attrib_list);
eglw::__eglMustCastToProperFunctionPointerType eglGetProcAddress (const char *procname);
eglw::EGLBoolean eglGetSyncAttrib (eglw::EGLDisplay dpy, eglw::EGLSync sync, eglw::EGLint attribute, eglw::EGLAttrib *value);
+eglw::EGLBoolean eglGetSyncAttribKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLint attribute, eglw::EGLint *value);
eglw::EGLBoolean eglInitialize (eglw::EGLDisplay dpy, eglw::EGLint *major, eglw::EGLint *minor);
+eglw::EGLBoolean eglLockSurfaceKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface, const eglw::EGLint *attrib_list);
eglw::EGLBoolean eglMakeCurrent (eglw::EGLDisplay dpy, eglw::EGLSurface draw, eglw::EGLSurface read, eglw::EGLContext ctx);
eglw::EGLenum eglQueryAPI (void);
eglw::EGLBoolean eglQueryContext (eglw::EGLDisplay dpy, eglw::EGLContext ctx, eglw::EGLint attribute, eglw::EGLint *value);
@@ -39,11 +49,16 @@
eglw::EGLBoolean eglQuerySurface (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint attribute, eglw::EGLint *value);
eglw::EGLBoolean eglReleaseTexImage (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint buffer);
eglw::EGLBoolean eglReleaseThread (void);
+eglw::EGLBoolean eglSetDamageRegionKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint *rects, eglw::EGLint n_rects);
+eglw::EGLBoolean eglSignalSyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLenum mode);
eglw::EGLBoolean eglSurfaceAttrib (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint attribute, eglw::EGLint value);
eglw::EGLBoolean eglSwapBuffers (eglw::EGLDisplay dpy, eglw::EGLSurface surface);
+eglw::EGLBoolean eglSwapBuffersWithDamageKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface, eglw::EGLint *rects, eglw::EGLint n_rects);
eglw::EGLBoolean eglSwapInterval (eglw::EGLDisplay dpy, eglw::EGLint interval);
eglw::EGLBoolean eglTerminate (eglw::EGLDisplay dpy);
+eglw::EGLBoolean eglUnlockSurfaceKHR (eglw::EGLDisplay dpy, eglw::EGLSurface surface);
eglw::EGLBoolean eglWaitClient (void);
eglw::EGLBoolean eglWaitGL (void);
eglw::EGLBoolean eglWaitNative (eglw::EGLint engine);
eglw::EGLBoolean eglWaitSync (eglw::EGLDisplay dpy, eglw::EGLSync sync, eglw::EGLint flags);
+eglw::EGLint eglWaitSyncKHR (eglw::EGLDisplay dpy, eglw::EGLSyncKHR sync, eglw::EGLint flags);
diff --git a/scripts/egl/__init__.py b/scripts/egl/__init__.py
index f170c8b..10c69ef 100644
--- a/scripts/egl/__init__.py
+++ b/scripts/egl/__init__.py
@@ -32,10 +32,9 @@
def gen ():
registry = getEGLRegistry()
iface = getDefaultInterface()
- noExtIface = getInterface(registry, 'egl', VERSION)
str_util.gen(iface)
- call_log_wrapper.gen(noExtIface)
+ call_log_wrapper.gen(iface)
proc_address_tests.gen()
enums.gen(iface)
func_ptrs.gen(iface)