[WRAPPER] Reworked libEGL with new wrapperhelper

4 files changed, 42 insertions, 32 deletions

diff --git a/src/wrapped/generated/functions_list.txt b/src/wrapped/generated/functions_list.txt
index 2f944729..fe26539e 100644
--- a/src/wrapped/generated/functions_list.txt
+++ b/src/wrapped/generated/functions_list.txt
@@ -1163,6 +1163,7 @@
 #() uFpupp
 #() uFpubp
 #() uFplup
+#() uFppii
 #() uFppiu
 #() uFppip
 #() uFppuu
@@ -1715,6 +1716,7 @@
 #() uFpplip
 #() uFpplpp
 #() uFppLpp
+#() uFpppip
 #() uFppppL
 #() uFppppp
 #() uFbCuuu
diff --git a/src/wrapped/generated/wrapper.c b/src/wrapped/generated/wrapper.c
index b878a617..5f3da4f1 100644
--- a/src/wrapped/generated/wrapper.c
+++ b/src/wrapped/generated/wrapper.c
@@ -1193,6 +1193,7 @@ typedef uint32_t (*uFpupu_t)(void*, uint32_t, void*, uint32_t);
 typedef uint32_t (*uFpupp_t)(void*, uint32_t, void*, void*);
 typedef uint32_t (*uFpubp_t)(void*, uint32_t, void*, void*);
 typedef uint32_t (*uFplup_t)(void*, intptr_t, uint32_t, void*);
+typedef uint32_t (*uFppii_t)(void*, void*, int32_t, int32_t);
 typedef uint32_t (*uFppiu_t)(void*, void*, int32_t, uint32_t);
 typedef uint32_t (*uFppip_t)(void*, void*, int32_t, void*);
 typedef uint32_t (*uFppuu_t)(void*, void*, uint32_t, uint32_t);
@@ -1744,6 +1745,7 @@ typedef uint32_t (*uFppupp_t)(void*, void*, uint32_t, void*, void*);
 typedef uint32_t (*uFpplip_t)(void*, void*, intptr_t, int32_t, void*);
 typedef uint32_t (*uFpplpp_t)(void*, void*, intptr_t, void*, void*);
 typedef uint32_t (*uFppLpp_t)(void*, void*, uintptr_t, void*, void*);
+typedef uint32_t (*uFpppip_t)(void*, void*, void*, int32_t, void*);
 typedef uint32_t (*uFppppL_t)(void*, void*, void*, void*, uintptr_t);
 typedef uint32_t (*uFppppp_t)(void*, void*, void*, void*, void*);
 typedef uint32_t (*uFbCuuu_t)(void*, uint8_t, uint32_t, uint32_t, uint32_t);
@@ -4396,6 +4398,7 @@ void uFpupu(x64emu_t *emu, uintptr_t fcn) { uFpupu_t fn = (uFpupu_t)fcn; R_RAX=(
 void uFpupp(x64emu_t *emu, uintptr_t fcn) { uFpupp_t fn = (uFpupp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, (void*)R_RDX, (void*)R_RCX); }
 void uFpubp(x64emu_t *emu, uintptr_t fcn) { uFpubp_t fn = (uFpubp_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDX); R_RAX=(uint32_t)fn((void*)R_RDI, (uint32_t)R_RSI, aligned_xcb, (void*)R_RCX); unalign_xcb_connection(aligned_xcb, (void*)R_RDX); }
 void uFplup(x64emu_t *emu, uintptr_t fcn) { uFplup_t fn = (uFplup_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (intptr_t)R_RSI, (uint32_t)R_RDX, (void*)R_RCX); }
+void uFppii(x64emu_t *emu, uintptr_t fcn) { uFppii_t fn = (uFppii_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (int32_t)R_RCX); }
 void uFppiu(x64emu_t *emu, uintptr_t fcn) { uFppiu_t fn = (uFppiu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (uint32_t)R_RCX); }
 void uFppip(x64emu_t *emu, uintptr_t fcn) { uFppip_t fn = (uFppip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (int32_t)R_RDX, (void*)R_RCX); }
 void uFppuu(x64emu_t *emu, uintptr_t fcn) { uFppuu_t fn = (uFppuu_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX); }
@@ -4947,6 +4950,7 @@ void uFppupp(x64emu_t *emu, uintptr_t fcn) { uFppupp_t fn = (uFppupp_t)fcn; R_RA
 void uFpplip(x64emu_t *emu, uintptr_t fcn) { uFpplip_t fn = (uFpplip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void uFpplpp(x64emu_t *emu, uintptr_t fcn) { uFpplpp_t fn = (uFpplpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (intptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFppLpp(x64emu_t *emu, uintptr_t fcn) { uFppLpp_t fn = (uFppLpp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (uintptr_t)R_RDX, (void*)R_RCX, (void*)R_R8); }
+void uFpppip(x64emu_t *emu, uintptr_t fcn) { uFpppip_t fn = (uFpppip_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (int32_t)R_RCX, (void*)R_R8); }
 void uFppppL(x64emu_t *emu, uintptr_t fcn) { uFppppL_t fn = (uFppppL_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (uintptr_t)R_R8); }
 void uFppppp(x64emu_t *emu, uintptr_t fcn) { uFppppp_t fn = (uFppppp_t)fcn; R_RAX=(uint32_t)fn((void*)R_RDI, (void*)R_RSI, (void*)R_RDX, (void*)R_RCX, (void*)R_R8); }
 void uFbCuuu(x64emu_t *emu, uintptr_t fcn) { uFbCuuu_t fn = (uFbCuuu_t)fcn; void *aligned_xcb = align_xcb_connection((void*)R_RDI); R_RAX=(uint32_t)fn(aligned_xcb, (uint8_t)R_RSI, (uint32_t)R_RDX, (uint32_t)R_RCX, (uint32_t)R_R8); unalign_xcb_connection(aligned_xcb, (void*)R_RDI); }
@@ -7384,6 +7388,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpupu) return 1;
 	if (fun == &uFpupp) return 1;
 	if (fun == &uFplup) return 1;
+	if (fun == &uFppii) return 1;
 	if (fun == &uFppiu) return 1;
 	if (fun == &uFppip) return 1;
 	if (fun == &uFppuu) return 1;
@@ -7832,6 +7837,7 @@ int isSimpleWrapper(wrapper_t fun) {
 	if (fun == &uFpplip) return 1;
 	if (fun == &uFpplpp) return 1;
 	if (fun == &uFppLpp) return 1;
+	if (fun == &uFpppip) return 1;
 	if (fun == &uFppppL) return 1;
 	if (fun == &uFppppp) return 1;
 	if (fun == &UFuiCiu) return 1;
diff --git a/src/wrapped/generated/wrapper.h b/src/wrapped/generated/wrapper.h
index 93e19cf9..694c005e 100644
--- a/src/wrapped/generated/wrapper.h
+++ b/src/wrapped/generated/wrapper.h
@@ -1200,6 +1200,7 @@ void uFpupu(x64emu_t *emu, uintptr_t fnc);
 void uFpupp(x64emu_t *emu, uintptr_t fnc);
 void uFpubp(x64emu_t *emu, uintptr_t fnc);
 void uFplup(x64emu_t *emu, uintptr_t fnc);
+void uFppii(x64emu_t *emu, uintptr_t fnc);
 void uFppiu(x64emu_t *emu, uintptr_t fnc);
 void uFppip(x64emu_t *emu, uintptr_t fnc);
 void uFppuu(x64emu_t *emu, uintptr_t fnc);
@@ -1752,6 +1753,7 @@ void uFppupp(x64emu_t *emu, uintptr_t fnc);
 void uFpplip(x64emu_t *emu, uintptr_t fnc);
 void uFpplpp(x64emu_t *emu, uintptr_t fnc);
 void uFppLpp(x64emu_t *emu, uintptr_t fnc);
+void uFpppip(x64emu_t *emu, uintptr_t fnc);
 void uFppppL(x64emu_t *emu, uintptr_t fnc);
 void uFppppp(x64emu_t *emu, uintptr_t fnc);
 void uFbCuuu(x64emu_t *emu, uintptr_t fnc);
diff --git a/src/wrapped/wrappedlibegl_private.h b/src/wrapped/wrappedlibegl_private.h
index 1f3eb966..086f325c 100644
--- a/src/wrapped/wrappedlibegl_private.h
+++ b/src/wrapped/wrappedlibegl_private.h
@@ -1,49 +1,49 @@
 #if !(defined(GO) && defined(GOM) && defined(GO2) && defined(DATA))
-#error meh!
+#error Meh...
 #endif
 
-GO(eglBindAPI, iFi)
-GO(eglBindTexImage, iFppi)
-GO(eglChooseConfig, iFpppip)
+GO(eglBindAPI, uFu)
+GO(eglBindTexImage, uFppi)
+GO(eglChooseConfig, uFpppip)
 GO(eglClientWaitSync, iFppiU)
-GO(eglCopyBuffers, iFppp)
+GO(eglCopyBuffers, uFppL)
 GO(eglCreateContext, pFpppp)
-GO(eglCreateImage, pFppuup)
-GO(eglCreatePbufferFromClientBuffer, pFpippp)
+GO(eglCreateImage, pFppupp)
+GO(eglCreatePbufferFromClientBuffer, pFpuppp)
 GO(eglCreatePbufferSurface, pFppp)
-GO(eglCreatePixmapSurface, pFpppp)
+GO(eglCreatePixmapSurface, pFppLp)
 GO(eglCreatePlatformPixmapSurface, pFpppp)
 GO(eglCreatePlatformWindowSurface, pFpppp)
 GO(eglCreateSync, pFpup)
-GO(eglCreateWindowSurface, pFpppp)
-GO(eglDestroyContext, iFpp)
-GO(eglDestroyImage, iFpp)
-GO(eglDestroySurface, iFpp)
-GO(eglDestroySync, iFpp)
-GO(eglGetConfigAttrib, iFppip)
-GO(eglGetConfigs, iFppip)
+GO(eglCreateWindowSurface, pFppLp)
+GO(eglDestroyContext, uFpp)
+GO(eglDestroyImage, uFpp)
+GO(eglDestroySurface, uFpp)
+GO(eglDestroySync, uFpp)
+GO(eglGetConfigAttrib, uFppip)
+GO(eglGetConfigs, uFppip)
 GO(eglGetCurrentContext, pFv)
 GO(eglGetCurrentDisplay, pFv)
 GO(eglGetCurrentSurface, pFi)
 GO(eglGetDisplay, pFp)
 GO(eglGetError, iFv)
-GO(eglGetPlatformDisplay, pFppp)
+GO(eglGetPlatformDisplay, pFupp)
 GOM(eglGetProcAddress, pFEp)
-GO(eglGetSyncAttrib, iFppip)
-GO(eglInitialize, iFppp)
-GO(eglMakeCurrent, iFpppp)
-GO(eglQueryAPI, iFv)
-GO(eglQueryContext, iFppip)
+GO(eglGetSyncAttrib, uFppip)
+GO(eglInitialize, uFppp)
+GO(eglMakeCurrent, uFpppp)
+GO(eglQueryAPI, uFv)
+GO(eglQueryContext, uFppip)
 GO(eglQueryString, pFpi)
-GO(eglQuerySurface, iFppip)
-GO(eglReleaseTexImage, iFppi)
-GO(eglReleaseThread, iFv)
-GO(eglSurfaceAttrib, iFppii)
-GO(eglSwapBuffers, iFpp)
-GO(eglSwapInterval, iFpi)
-GO(eglTerminate, iFp)
-GO(eglWaitClient, iFv)
-GO(eglWaitGL, iFv)
-GO(eglWaitNative, iFi)
-GO(eglWaitSync, iFppi)
+GO(eglQuerySurface, uFppip)
+GO(eglReleaseTexImage, uFppi)
+GO(eglReleaseThread, uFv)
+GO(eglSurfaceAttrib, uFppii)
+GO(eglSwapBuffers, uFpp)
+GO(eglSwapInterval, uFpi)
+GO(eglTerminate, uFp)
+GO(eglWaitClient, uFv)
+GO(eglWaitGL, uFv)
+GO(eglWaitNative, uFi)
+GO(eglWaitSync, uFppi)