Commit 12794e2d by Nicolas Capens

Dispatch EGL entry functions to avoid resolving to the same symbol.

Bug 18752589 Change-Id: I96bbad9ab0593b93b219ec8a769523342497c5da Reviewed-on: https://swiftshader-review.googlesource.com/2910Reviewed-by: 's avatarNicolas Capens <capn@google.com> Tested-by: 's avatarNicolas Capens <capn@google.com>
parent 0273322c
...@@ -88,9 +88,9 @@ static bool validateSurface(egl::Display *display, egl::Surface *surface) ...@@ -88,9 +88,9 @@ static bool validateSurface(egl::Display *display, egl::Surface *surface)
return true; return true;
} }
extern "C" namespace egl
{ {
EGLAPI EGLint EGLAPIENTRY eglGetError(void) EGLint GetError(void)
{ {
TRACE("()"); TRACE("()");
...@@ -104,14 +104,14 @@ EGLAPI EGLint EGLAPIENTRY eglGetError(void) ...@@ -104,14 +104,14 @@ EGLAPI EGLint EGLAPIENTRY eglGetError(void)
return error; return error;
} }
EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id) EGLDisplay GetDisplay(EGLNativeDisplayType display_id)
{ {
TRACE("(EGLNativeDisplayType display_id = %p)", display_id); TRACE("(EGLNativeDisplayType display_id = %p)", display_id);
return egl::Display::getPlatformDisplay(EGL_UNKNOWN, display_id); return egl::Display::getPlatformDisplay(EGL_UNKNOWN, display_id);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor) EGLBoolean Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
{ {
TRACE("(EGLDisplay dpy = %p, EGLint *major = %p, EGLint *minor = %p)", TRACE("(EGLDisplay dpy = %p, EGLint *major = %p, EGLint *minor = %p)",
dpy, major, minor); dpy, major, minor);
...@@ -134,7 +134,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLin ...@@ -134,7 +134,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLin
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy) EGLBoolean Terminate(EGLDisplay dpy)
{ {
TRACE("(EGLDisplay dpy = %p)", dpy); TRACE("(EGLDisplay dpy = %p)", dpy);
...@@ -150,7 +150,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy) ...@@ -150,7 +150,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name) const char *QueryString(EGLDisplay dpy, EGLint name)
{ {
TRACE("(EGLDisplay dpy = %p, EGLint name = %d)", dpy, name); TRACE("(EGLDisplay dpy = %p, EGLint name = %d)", dpy, name);
...@@ -187,7 +187,7 @@ EGLAPI const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name) ...@@ -187,7 +187,7 @@ EGLAPI const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
return error(EGL_BAD_PARAMETER, (const char*)NULL); return error(EGL_BAD_PARAMETER, (const char*)NULL);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config) EGLBoolean GetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)
{ {
TRACE("(EGLDisplay dpy = %p, EGLConfig *configs = %p, " TRACE("(EGLDisplay dpy = %p, EGLConfig *configs = %p, "
"EGLint config_size = %d, EGLint *num_config = %p)", "EGLint config_size = %d, EGLint *num_config = %p)",
...@@ -215,7 +215,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, ...@@ -215,7 +215,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs,
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config) EGLBoolean ChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)
{ {
TRACE("(EGLDisplay dpy = %p, const EGLint *attrib_list = %p, " TRACE("(EGLDisplay dpy = %p, const EGLint *attrib_list = %p, "
"EGLConfig *configs = %p, EGLint config_size = %d, EGLint *num_config = %p)", "EGLConfig *configs = %p, EGLint config_size = %d, EGLint *num_config = %p)",
...@@ -245,7 +245,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attr ...@@ -245,7 +245,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attr
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value) EGLBoolean GetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)
{ {
TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLint attribute = %d, EGLint *value = %p)", TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLint attribute = %d, EGLint *value = %p)",
dpy, config, attribute, value); dpy, config, attribute, value);
...@@ -265,7 +265,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig confi ...@@ -265,7 +265,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig confi
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list) EGLSurface CreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)
{ {
TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLNativeWindowType win = %p, " TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLNativeWindowType win = %p, "
"const EGLint *attrib_list = %p)", dpy, config, window, attrib_list); "const EGLint *attrib_list = %p)", dpy, config, window, attrib_list);
...@@ -285,7 +285,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c ...@@ -285,7 +285,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig c
return display->createWindowSurface(window, config, attrib_list); return display->createWindowSurface(window, config, attrib_list);
} }
EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list) EGLSurface CreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)
{ {
TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, const EGLint *attrib_list = %p)", TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, const EGLint *attrib_list = %p)",
dpy, config, attrib_list); dpy, config, attrib_list);
...@@ -300,7 +300,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig ...@@ -300,7 +300,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig
return display->createOffscreenSurface(config, attrib_list); return display->createOffscreenSurface(config, attrib_list);
} }
EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list) EGLSurface CreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)
{ {
TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLNativePixmapType pixmap = %p, " TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLNativePixmapType pixmap = %p, "
"const EGLint *attrib_list = %p)", dpy, config, pixmap, attrib_list); "const EGLint *attrib_list = %p)", dpy, config, pixmap, attrib_list);
...@@ -317,7 +317,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig c ...@@ -317,7 +317,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig c
return success(EGL_NO_SURFACE); return success(EGL_NO_SURFACE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface) EGLBoolean DestroySurface(EGLDisplay dpy, EGLSurface surface)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p)", dpy, surface); TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p)", dpy, surface);
...@@ -339,7 +339,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surfa ...@@ -339,7 +339,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surfa
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value) EGLBoolean QuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint attribute = %d, EGLint *value = %p)", TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint attribute = %d, EGLint *value = %p)",
dpy, surface, attribute, value); dpy, surface, attribute, value);
...@@ -414,7 +414,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface ...@@ -414,7 +414,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api) EGLBoolean BindAPI(EGLenum api)
{ {
TRACE("(EGLenum api = 0x%X)", api); TRACE("(EGLenum api = 0x%X)", api);
...@@ -434,7 +434,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api) ...@@ -434,7 +434,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void) EGLenum QueryAPI(void)
{ {
TRACE("()"); TRACE("()");
...@@ -443,7 +443,7 @@ EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void) ...@@ -443,7 +443,7 @@ EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void)
return success(API); return success(API);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void) EGLBoolean WaitClient(void)
{ {
TRACE("()"); TRACE("()");
...@@ -452,7 +452,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void) ...@@ -452,7 +452,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void)
return success(EGL_FALSE); return success(EGL_FALSE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void) EGLBoolean ReleaseThread(void)
{ {
TRACE("()"); TRACE("()");
...@@ -461,7 +461,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void) ...@@ -461,7 +461,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void)
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list) EGLSurface CreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
{ {
TRACE("(EGLDisplay dpy = %p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = %p, " TRACE("(EGLDisplay dpy = %p, EGLenum buftype = 0x%X, EGLClientBuffer buffer = %p, "
"EGLConfig config = %p, const EGLint *attrib_list = %p)", "EGLConfig config = %p, const EGLint *attrib_list = %p)",
...@@ -472,7 +472,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, E ...@@ -472,7 +472,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, E
return error(EGL_BAD_PARAMETER, EGL_NO_SURFACE); return error(EGL_BAD_PARAMETER, EGL_NO_SURFACE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value) EGLBoolean SurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint attribute = %d, EGLint value = %d)", TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint attribute = %d, EGLint value = %d)",
dpy, surface, attribute, value); dpy, surface, attribute, value);
...@@ -508,7 +508,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surfac ...@@ -508,7 +508,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surfac
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) EGLBoolean BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint buffer = %d)", dpy, surface, buffer); TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint buffer = %d)", dpy, surface, buffer);
...@@ -550,7 +550,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface ...@@ -550,7 +550,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer) EGLBoolean ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint buffer = %d)", dpy, surface, buffer); TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLint buffer = %d)", dpy, surface, buffer);
...@@ -587,7 +587,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surf ...@@ -587,7 +587,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surf
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval) EGLBoolean SwapInterval(EGLDisplay dpy, EGLint interval)
{ {
TRACE("(EGLDisplay dpy = %p, EGLint interval = %d)", dpy, interval); TRACE("(EGLDisplay dpy = %p, EGLint interval = %d)", dpy, interval);
...@@ -610,7 +610,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval) ...@@ -610,7 +610,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list) EGLContext CreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)
{ {
TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLContext share_context = %p, " TRACE("(EGLDisplay dpy = %p, EGLConfig config = %p, EGLContext share_context = %p, "
"const EGLint *attrib_list = %p)", dpy, config, share_context, attrib_list); "const EGLint *attrib_list = %p)", dpy, config, share_context, attrib_list);
...@@ -647,7 +647,7 @@ EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, ...@@ -647,7 +647,7 @@ EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config,
return display->createContext(config, shareContext, clientVersion); return display->createContext(config, shareContext, clientVersion);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx) EGLBoolean DestroyContext(EGLDisplay dpy, EGLContext ctx)
{ {
TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p)", dpy, ctx); TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p)", dpy, ctx);
...@@ -669,7 +669,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx) ...@@ -669,7 +669,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx) EGLBoolean MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface draw = %p, EGLSurface read = %p, EGLContext ctx = %p)", TRACE("(EGLDisplay dpy = %p, EGLSurface draw = %p, EGLSurface read = %p, EGLContext ctx = %p)",
dpy, draw, read, ctx); dpy, draw, read, ctx);
...@@ -726,7 +726,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EG ...@@ -726,7 +726,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EG
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void) EGLContext GetCurrentContext(void)
{ {
TRACE("()"); TRACE("()");
...@@ -735,7 +735,7 @@ EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void) ...@@ -735,7 +735,7 @@ EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void)
return success(context); return success(context);
} }
EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw) EGLSurface GetCurrentSurface(EGLint readdraw)
{ {
TRACE("(EGLint readdraw = %d)", readdraw); TRACE("(EGLint readdraw = %d)", readdraw);
...@@ -755,7 +755,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw) ...@@ -755,7 +755,7 @@ EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)
} }
} }
EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void) EGLDisplay GetCurrentDisplay(void)
{ {
TRACE("()"); TRACE("()");
...@@ -764,7 +764,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void) ...@@ -764,7 +764,7 @@ EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)
return success(dpy); return success(dpy);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value) EGLBoolean QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
{ {
TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p, EGLint attribute = %d, EGLint *value = %p)", TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p, EGLint attribute = %d, EGLint *value = %p)",
dpy, ctx, attribute, value); dpy, ctx, attribute, value);
...@@ -782,7 +782,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EG ...@@ -782,7 +782,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EG
return success(0); return success(0);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void) EGLBoolean WaitGL(void)
{ {
TRACE("()"); TRACE("()");
...@@ -791,7 +791,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void) ...@@ -791,7 +791,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void)
return success(EGL_FALSE); return success(EGL_FALSE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine) EGLBoolean WaitNative(EGLint engine)
{ {
TRACE("(EGLint engine = %d)", engine); TRACE("(EGLint engine = %d)", engine);
...@@ -800,7 +800,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine) ...@@ -800,7 +800,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)
return success(EGL_FALSE); return success(EGL_FALSE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) EGLBoolean SwapBuffers(EGLDisplay dpy, EGLSurface surface)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p)", dpy, surface); TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p)", dpy, surface);
...@@ -822,7 +822,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface) ...@@ -822,7 +822,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target) EGLBoolean CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
{ {
TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLNativePixmapType target = %p)", dpy, surface, target); TRACE("(EGLDisplay dpy = %p, EGLSurface surface = %p, EGLNativePixmapType target = %p)", dpy, surface, target);
...@@ -839,7 +839,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, ...@@ -839,7 +839,7 @@ EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface,
return success(EGL_FALSE); return success(EGL_FALSE);
} }
EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list) EGLImageKHR CreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)
{ {
TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p, EGLenum target = 0x%X, buffer = %p, const EGLint attrib_list = %p)", dpy, ctx, target, buffer, attrib_list); TRACE("(EGLDisplay dpy = %p, EGLContext ctx = %p, EGLenum target = 0x%X, buffer = %p, const EGLint attrib_list = %p)", dpy, ctx, target, buffer, attrib_list);
...@@ -913,7 +913,7 @@ EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, ...@@ -913,7 +913,7 @@ EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx,
return success((EGLImageKHR)image); return success((EGLImageKHR)image);
} }
EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image) EGLBoolean DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
{ {
TRACE("(EGLDisplay dpy = %p, EGLImageKHR image = %p)", dpy, image); TRACE("(EGLDisplay dpy = %p, EGLImageKHR image = %p)", dpy, image);
...@@ -935,24 +935,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR ima ...@@ -935,24 +935,24 @@ EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR ima
return success(EGL_TRUE); return success(EGL_TRUE);
} }
EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list) EGLDisplay GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)
{ {
TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list); TRACE("(EGLenum platform = 0x%X, void *native_display = %p, const EGLint *attrib_list = %p)", platform, native_display, attrib_list);
return egl::Display::getPlatformDisplay(platform, (EGLNativeDisplayType)native_display); return egl::Display::getPlatformDisplay(platform, (EGLNativeDisplayType)native_display);
} }
EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list) EGLSurface CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list)
{ {
return eglCreateWindowSurface(dpy, config, (EGLNativeWindowType)native_window, attrib_list); return CreateWindowSurface(dpy, config, (EGLNativeWindowType)native_window, attrib_list);
} }
EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list) EGLSurface CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list)
{ {
return eglCreatePixmapSurface(dpy, config, (EGLNativePixmapType)native_pixmap, attrib_list); return CreatePixmapSurface(dpy, config, (EGLNativePixmapType)native_pixmap, attrib_list);
} }
EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname) __eglMustCastToProperFunctionPointerType GetProcAddress(const char *procname)
{ {
TRACE("(const char *procname = \"%s\")", procname); TRACE("(const char *procname = \"%s\")", procname);
......
...@@ -11,42 +11,42 @@ class LibEGLexports ...@@ -11,42 +11,42 @@ class LibEGLexports
public: public:
LibEGLexports(); LibEGLexports();
EGLint (EGLAPIENTRY *eglGetError)(void); EGLint (*eglGetError)(void);
EGLDisplay (EGLAPIENTRY *eglGetDisplay)(EGLNativeDisplayType display_id); EGLDisplay (*eglGetDisplay)(EGLNativeDisplayType display_id);
EGLBoolean (EGLAPIENTRY *eglInitialize)(EGLDisplay dpy, EGLint *major, EGLint *minor); EGLBoolean (*eglInitialize)(EGLDisplay dpy, EGLint *major, EGLint *minor);
EGLBoolean (EGLAPIENTRY *eglTerminate)(EGLDisplay dpy); EGLBoolean (*eglTerminate)(EGLDisplay dpy);
const char *(EGLAPIENTRY *eglQueryString)(EGLDisplay dpy, EGLint name); const char *(*eglQueryString)(EGLDisplay dpy, EGLint name);
EGLBoolean (EGLAPIENTRY *eglGetConfigs)(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config); EGLBoolean (*eglGetConfigs)(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
EGLBoolean (EGLAPIENTRY *eglChooseConfig)(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config); EGLBoolean (*eglChooseConfig)(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
EGLBoolean (EGLAPIENTRY *eglGetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value); EGLBoolean (*eglGetConfigAttrib)(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
EGLSurface (EGLAPIENTRY *eglCreateWindowSurface)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list); EGLSurface (*eglCreateWindowSurface)(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list);
EGLSurface (EGLAPIENTRY *eglCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list); EGLSurface (*eglCreatePbufferSurface)(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
EGLSurface (EGLAPIENTRY *eglCreatePixmapSurface)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list); EGLSurface (*eglCreatePixmapSurface)(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);
EGLBoolean (EGLAPIENTRY *eglDestroySurface)(EGLDisplay dpy, EGLSurface surface); EGLBoolean (*eglDestroySurface)(EGLDisplay dpy, EGLSurface surface);
EGLBoolean (EGLAPIENTRY *eglQuerySurface)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value); EGLBoolean (*eglQuerySurface)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
EGLBoolean (EGLAPIENTRY *eglBindAPI)(EGLenum api); EGLBoolean (*eglBindAPI)(EGLenum api);
EGLenum (EGLAPIENTRY *eglQueryAPI)(void); EGLenum (*eglQueryAPI)(void);
EGLBoolean (EGLAPIENTRY *eglWaitClient)(void); EGLBoolean (*eglWaitClient)(void);
EGLBoolean (EGLAPIENTRY *eglReleaseThread)(void); EGLBoolean (*eglReleaseThread)(void);
EGLSurface (EGLAPIENTRY *eglCreatePbufferFromClientBuffer)(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list); EGLSurface (*eglCreatePbufferFromClientBuffer)(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
EGLBoolean (EGLAPIENTRY *eglSurfaceAttrib)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value); EGLBoolean (*eglSurfaceAttrib)(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
EGLBoolean (EGLAPIENTRY *eglBindTexImage)(EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLBoolean (*eglBindTexImage)(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
EGLBoolean (EGLAPIENTRY *eglReleaseTexImage)(EGLDisplay dpy, EGLSurface surface, EGLint buffer); EGLBoolean (*eglReleaseTexImage)(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
EGLBoolean (EGLAPIENTRY *eglSwapInterval)(EGLDisplay dpy, EGLint interval); EGLBoolean (*eglSwapInterval)(EGLDisplay dpy, EGLint interval);
EGLContext (EGLAPIENTRY *eglCreateContext)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list); EGLContext (*eglCreateContext)(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
EGLBoolean (EGLAPIENTRY *eglDestroyContext)(EGLDisplay dpy, EGLContext ctx); EGLBoolean (*eglDestroyContext)(EGLDisplay dpy, EGLContext ctx);
EGLBoolean (EGLAPIENTRY *eglMakeCurrent)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx); EGLBoolean (*eglMakeCurrent)(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
EGLContext (EGLAPIENTRY *eglGetCurrentContext)(void); EGLContext (*eglGetCurrentContext)(void);
EGLSurface (EGLAPIENTRY *eglGetCurrentSurface)(EGLint readdraw); EGLSurface (*eglGetCurrentSurface)(EGLint readdraw);
EGLDisplay (EGLAPIENTRY *eglGetCurrentDisplay)(void); EGLDisplay (*eglGetCurrentDisplay)(void);
EGLBoolean (EGLAPIENTRY *eglQueryContext)(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value); EGLBoolean (*eglQueryContext)(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
EGLBoolean (EGLAPIENTRY *eglWaitGL)(void); EGLBoolean (*eglWaitGL)(void);
EGLBoolean (EGLAPIENTRY *eglWaitNative)(EGLint engine); EGLBoolean (*eglWaitNative)(EGLint engine);
EGLBoolean (EGLAPIENTRY *eglSwapBuffers)(EGLDisplay dpy, EGLSurface surface); EGLBoolean (*eglSwapBuffers)(EGLDisplay dpy, EGLSurface surface);
EGLBoolean (EGLAPIENTRY *eglCopyBuffers)(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target); EGLBoolean (*eglCopyBuffers)(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
EGLImageKHR (EGLAPIENTRY *eglCreateImageKHR)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list); EGLImageKHR (*eglCreateImageKHR)(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
EGLBoolean (EGLAPIENTRY *eglDestroyImageKHR)(EGLDisplay dpy, EGLImageKHR image); EGLBoolean (*eglDestroyImageKHR)(EGLDisplay dpy, EGLImageKHR image);
__eglMustCastToProperFunctionPointerType (EGLAPIENTRY *eglGetProcAddress)(const char*); __eglMustCastToProperFunctionPointerType (*eglGetProcAddress)(const char*);
// Functions that don't change the error code, for use by client APIs // Functions that don't change the error code, for use by client APIs
egl::Context *(*clientGetCurrentContext)(); egl::Context *(*clientGetCurrentContext)();
......
...@@ -320,50 +320,291 @@ void error(EGLint errorCode) ...@@ -320,50 +320,291 @@ void error(EGLint errorCode)
} }
} }
namespace egl
{
EGLint GetError(void);
EGLDisplay GetDisplay(EGLNativeDisplayType display_id);
EGLBoolean Initialize(EGLDisplay dpy, EGLint *major, EGLint *minor);
EGLBoolean Terminate(EGLDisplay dpy);
const char *QueryString(EGLDisplay dpy, EGLint name);
EGLBoolean GetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config);
EGLBoolean ChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config);
EGLBoolean GetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value);
EGLSurface CreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list);
EGLSurface CreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list);
EGLSurface CreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list);
EGLBoolean DestroySurface(EGLDisplay dpy, EGLSurface surface);
EGLBoolean QuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value);
EGLBoolean BindAPI(EGLenum api);
EGLenum QueryAPI(void);
EGLBoolean WaitClient(void);
EGLBoolean ReleaseThread(void);
EGLSurface CreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list);
EGLBoolean SurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value);
EGLBoolean BindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
EGLBoolean ReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer);
EGLBoolean SwapInterval(EGLDisplay dpy, EGLint interval);
EGLContext CreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list);
EGLBoolean DestroyContext(EGLDisplay dpy, EGLContext ctx);
EGLBoolean MakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx);
EGLContext GetCurrentContext(void);
EGLSurface GetCurrentSurface(EGLint readdraw);
EGLDisplay GetCurrentDisplay(void);
EGLBoolean QueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value);
EGLBoolean WaitGL(void);
EGLBoolean WaitNative(EGLint engine);
EGLBoolean SwapBuffers(EGLDisplay dpy, EGLSurface surface);
EGLBoolean CopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target);
EGLImageKHR CreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list);
EGLBoolean DestroyImageKHR(EGLDisplay dpy, EGLImageKHR image);
EGLDisplay GetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list);
EGLSurface CreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list);
EGLSurface CreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list);
__eglMustCastToProperFunctionPointerType GetProcAddress(const char *procname);
}
extern "C"
{
EGLAPI EGLint EGLAPIENTRY eglGetError(void)
{
return egl::GetError();
}
EGLAPI EGLDisplay EGLAPIENTRY eglGetDisplay(EGLNativeDisplayType display_id)
{
return egl::GetDisplay(display_id);
}
EGLAPI EGLBoolean EGLAPIENTRY eglInitialize(EGLDisplay dpy, EGLint *major, EGLint *minor)
{
return egl::Initialize(dpy, major, minor);
}
EGLAPI EGLBoolean EGLAPIENTRY eglTerminate(EGLDisplay dpy)
{
return egl::Terminate(dpy);
}
EGLAPI const char *EGLAPIENTRY eglQueryString(EGLDisplay dpy, EGLint name)
{
return egl::QueryString(dpy, name);
}
EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigs(EGLDisplay dpy, EGLConfig *configs, EGLint config_size, EGLint *num_config)
{
return egl::GetConfigs(dpy, configs, config_size, num_config);
}
EGLAPI EGLBoolean EGLAPIENTRY eglChooseConfig(EGLDisplay dpy, const EGLint *attrib_list, EGLConfig *configs, EGLint config_size, EGLint *num_config)
{
return egl::ChooseConfig(dpy, attrib_list, configs, config_size, num_config);
}
EGLAPI EGLBoolean EGLAPIENTRY eglGetConfigAttrib(EGLDisplay dpy, EGLConfig config, EGLint attribute, EGLint *value)
{
return egl::GetConfigAttrib(dpy, config, attribute, value);
}
EGLAPI EGLSurface EGLAPIENTRY eglCreateWindowSurface(EGLDisplay dpy, EGLConfig config, EGLNativeWindowType window, const EGLint *attrib_list)
{
return egl::CreateWindowSurface(dpy, config, window, attrib_list);
}
EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferSurface(EGLDisplay dpy, EGLConfig config, const EGLint *attrib_list)
{
return egl::CreatePbufferSurface(dpy, config, attrib_list);
}
EGLAPI EGLSurface EGLAPIENTRY eglCreatePixmapSurface(EGLDisplay dpy, EGLConfig config, EGLNativePixmapType pixmap, const EGLint *attrib_list)
{
return egl::CreatePixmapSurface(dpy, config, pixmap, attrib_list);
}
EGLAPI EGLBoolean EGLAPIENTRY eglDestroySurface(EGLDisplay dpy, EGLSurface surface)
{
return egl::DestroySurface(dpy, surface);
}
EGLAPI EGLBoolean EGLAPIENTRY eglQuerySurface(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint *value)
{
return egl::QuerySurface(dpy, surface, attribute, value);
}
EGLAPI EGLBoolean EGLAPIENTRY eglBindAPI(EGLenum api)
{
return egl::BindAPI(api);
}
EGLAPI EGLenum EGLAPIENTRY eglQueryAPI(void)
{
return egl::QueryAPI();
}
EGLAPI EGLBoolean EGLAPIENTRY eglWaitClient(void)
{
return egl::WaitClient();
}
EGLAPI EGLBoolean EGLAPIENTRY eglReleaseThread(void)
{
return egl::ReleaseThread();
}
EGLAPI EGLSurface EGLAPIENTRY eglCreatePbufferFromClientBuffer(EGLDisplay dpy, EGLenum buftype, EGLClientBuffer buffer, EGLConfig config, const EGLint *attrib_list)
{
return egl::CreatePbufferFromClientBuffer(dpy, buftype, buffer, config, attrib_list);
}
EGLAPI EGLBoolean EGLAPIENTRY eglSurfaceAttrib(EGLDisplay dpy, EGLSurface surface, EGLint attribute, EGLint value)
{
return egl::SurfaceAttrib(dpy, surface, attribute, value);
}
EGLAPI EGLBoolean EGLAPIENTRY eglBindTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{
return egl::BindTexImage(dpy, surface, buffer);
}
EGLAPI EGLBoolean EGLAPIENTRY eglReleaseTexImage(EGLDisplay dpy, EGLSurface surface, EGLint buffer)
{
return egl::ReleaseTexImage(dpy, surface, buffer);
}
EGLAPI EGLBoolean EGLAPIENTRY eglSwapInterval(EGLDisplay dpy, EGLint interval)
{
return egl::SwapInterval(dpy, interval);
}
EGLAPI EGLContext EGLAPIENTRY eglCreateContext(EGLDisplay dpy, EGLConfig config, EGLContext share_context, const EGLint *attrib_list)
{
return egl::CreateContext(dpy, config, share_context, attrib_list);
}
EGLAPI EGLBoolean EGLAPIENTRY eglDestroyContext(EGLDisplay dpy, EGLContext ctx)
{
return egl::DestroyContext(dpy, ctx);
}
EGLAPI EGLBoolean EGLAPIENTRY eglMakeCurrent(EGLDisplay dpy, EGLSurface draw, EGLSurface read, EGLContext ctx)
{
return egl::MakeCurrent(dpy, draw, read, ctx);
}
EGLAPI EGLContext EGLAPIENTRY eglGetCurrentContext(void)
{
return egl::GetCurrentContext();
}
EGLAPI EGLSurface EGLAPIENTRY eglGetCurrentSurface(EGLint readdraw)
{
return egl::GetCurrentSurface(readdraw);
}
EGLAPI EGLDisplay EGLAPIENTRY eglGetCurrentDisplay(void)
{
return egl::GetCurrentDisplay();
}
EGLAPI EGLBoolean EGLAPIENTRY eglQueryContext(EGLDisplay dpy, EGLContext ctx, EGLint attribute, EGLint *value)
{
return egl::QueryContext(dpy, ctx, attribute, value);
}
EGLAPI EGLBoolean EGLAPIENTRY eglWaitGL(void)
{
return egl::WaitClient();
}
EGLAPI EGLBoolean EGLAPIENTRY eglWaitNative(EGLint engine)
{
return egl::WaitNative(engine);
}
EGLAPI EGLBoolean EGLAPIENTRY eglSwapBuffers(EGLDisplay dpy, EGLSurface surface)
{
return egl::SwapBuffers(dpy, surface);
}
EGLAPI EGLBoolean EGLAPIENTRY eglCopyBuffers(EGLDisplay dpy, EGLSurface surface, EGLNativePixmapType target)
{
return egl::CopyBuffers(dpy, surface, target);
}
EGLAPI EGLImageKHR EGLAPIENTRY eglCreateImageKHR(EGLDisplay dpy, EGLContext ctx, EGLenum target, EGLClientBuffer buffer, const EGLint *attrib_list)
{
return egl::CreateImageKHR(dpy, ctx, target, buffer, attrib_list);
}
EGLAPI EGLBoolean EGLAPIENTRY eglDestroyImageKHR(EGLDisplay dpy, EGLImageKHR image)
{
return egl::DestroyImageKHR(dpy, image);
}
EGLAPI EGLDisplay EGLAPIENTRY eglGetPlatformDisplayEXT(EGLenum platform, void *native_display, const EGLint *attrib_list)
{
return egl::GetPlatformDisplayEXT(platform, native_display, attrib_list);
}
EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformWindowSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_window, const EGLint *attrib_list)
{
return egl::CreatePlatformWindowSurfaceEXT(dpy, config, native_window, attrib_list);
}
EGLAPI EGLSurface EGLAPIENTRY eglCreatePlatformPixmapSurfaceEXT(EGLDisplay dpy, EGLConfig config, void *native_pixmap, const EGLint *attrib_list)
{
return egl::CreatePlatformPixmapSurfaceEXT(dpy, config, native_pixmap, attrib_list);
}
EGLAPI __eglMustCastToProperFunctionPointerType EGLAPIENTRY eglGetProcAddress(const char *procname)
{
return egl::GetProcAddress(procname);
}
}
LibEGLexports::LibEGLexports() LibEGLexports::LibEGLexports()
{ {
this->eglGetError = ::eglGetError; this->eglGetError = egl::GetError;
this->eglGetDisplay = ::eglGetDisplay; this->eglGetDisplay = egl::GetDisplay;
this->eglInitialize = ::eglInitialize; this->eglInitialize = egl::Initialize;
this->eglTerminate = ::eglTerminate; this->eglTerminate = egl::Terminate;
this->eglQueryString = ::eglQueryString; this->eglQueryString = egl::QueryString;
this->eglGetConfigs = ::eglGetConfigs; this->eglGetConfigs = egl::GetConfigs;
this->eglChooseConfig = ::eglChooseConfig; this->eglChooseConfig = egl::ChooseConfig;
this->eglGetConfigAttrib = ::eglGetConfigAttrib; this->eglGetConfigAttrib = egl::GetConfigAttrib;
this->eglCreateWindowSurface = ::eglCreateWindowSurface; this->eglCreateWindowSurface = egl::CreateWindowSurface;
this->eglCreatePbufferSurface = ::eglCreatePbufferSurface; this->eglCreatePbufferSurface = egl::CreatePbufferSurface;
this->eglCreatePixmapSurface = ::eglCreatePixmapSurface; this->eglCreatePixmapSurface = egl::CreatePixmapSurface;
this->eglDestroySurface = ::eglDestroySurface; this->eglDestroySurface = egl::DestroySurface;
this->eglQuerySurface = ::eglQuerySurface; this->eglQuerySurface = egl::QuerySurface;
this->eglBindAPI = ::eglBindAPI; this->eglBindAPI = egl::BindAPI;
this->eglQueryAPI = ::eglQueryAPI; this->eglQueryAPI = egl::QueryAPI;
this->eglWaitClient = ::eglWaitClient; this->eglWaitClient = egl::WaitClient;
this->eglReleaseThread = ::eglReleaseThread; this->eglReleaseThread = egl::ReleaseThread;
this->eglCreatePbufferFromClientBuffer = ::eglCreatePbufferFromClientBuffer; this->eglCreatePbufferFromClientBuffer = egl::CreatePbufferFromClientBuffer;
this->eglSurfaceAttrib = ::eglSurfaceAttrib; this->eglSurfaceAttrib = egl::SurfaceAttrib;
this->eglBindTexImage = ::eglBindTexImage; this->eglBindTexImage = egl::BindTexImage;
this->eglReleaseTexImage = ::eglReleaseTexImage; this->eglReleaseTexImage = egl::ReleaseTexImage;
this->eglSwapInterval = ::eglSwapInterval; this->eglSwapInterval = egl::SwapInterval;
this->eglCreateContext = ::eglCreateContext; this->eglCreateContext = egl::CreateContext;
this->eglDestroyContext = ::eglDestroyContext; this->eglDestroyContext = egl::DestroyContext;
this->eglMakeCurrent = ::eglMakeCurrent; this->eglMakeCurrent = egl::MakeCurrent;
this->eglGetCurrentContext = ::eglGetCurrentContext; this->eglGetCurrentContext = egl::GetCurrentContext;
this->eglGetCurrentSurface = ::eglGetCurrentSurface; this->eglGetCurrentSurface = egl::GetCurrentSurface;
this->eglGetCurrentDisplay = ::eglGetCurrentDisplay; this->eglGetCurrentDisplay = egl::GetCurrentDisplay;
this->eglQueryContext = ::eglQueryContext; this->eglQueryContext = egl::QueryContext;
this->eglWaitGL = ::eglWaitGL; this->eglWaitGL = egl::WaitGL;
this->eglWaitNative = ::eglWaitNative; this->eglWaitNative = egl::WaitNative;
this->eglSwapBuffers = ::eglSwapBuffers; this->eglSwapBuffers = egl::SwapBuffers;
this->eglCopyBuffers = ::eglCopyBuffers; this->eglCopyBuffers = egl::CopyBuffers;
this->eglCreateImageKHR = ::eglCreateImageKHR; this->eglCreateImageKHR = egl::CreateImageKHR;
this->eglDestroyImageKHR = ::eglDestroyImageKHR; this->eglDestroyImageKHR = egl::DestroyImageKHR;
this->eglGetProcAddress = ::eglGetProcAddress; this->eglGetProcAddress = egl::GetProcAddress;
this->clientGetCurrentContext = egl::getCurrentContext; this->clientGetCurrentContext = egl::getCurrentContext;
this->clientGetCurrentDisplay = egl::getCurrentDisplay; this->clientGetCurrentDisplay = egl::getCurrentDisplay;
} }
extern "C" LibEGLexports *libEGL_swiftshader() extern "C" EGLAPI LibEGLexports *libEGL_swiftshader()
{ {
static LibEGLexports libEGL; static LibEGLexports libEGL;
return &libEGL; return &libEGL;
......
...@@ -156,7 +156,7 @@ LibGLES_CMexports::LibGLES_CMexports() ...@@ -156,7 +156,7 @@ LibGLES_CMexports::LibGLES_CMexports()
this->glEGLImageTargetTexture2DOES = ::glEGLImageTargetTexture2DOES; this->glEGLImageTargetTexture2DOES = ::glEGLImageTargetTexture2DOES;
} }
extern "C" LibGLES_CMexports *libGLES_CM_swiftshader() extern "C" GL_API LibGLES_CMexports *libGLES_CM_swiftshader()
{ {
static LibGLES_CMexports libGLES_CM; static LibGLES_CMexports libGLES_CM;
return &libGLES_CM; return &libGLES_CM;
......
...@@ -165,7 +165,7 @@ LibGLESv2exports::LibGLESv2exports() ...@@ -165,7 +165,7 @@ LibGLESv2exports::LibGLESv2exports()
this->createFrameBuffer = ::createFrameBuffer; this->createFrameBuffer = ::createFrameBuffer;
} }
extern "C" LibGLESv2exports *libGLESv2_swiftshader() extern "C" GL_APICALL LibGLESv2exports *libGLESv2_swiftshader()
{ {
static LibGLESv2exports libGLESv2; static LibGLESv2exports libGLESv2;
return &libGLESv2; return &libGLESv2;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment