diff options
| author | Emil Velikov <[email protected]> | 2016-05-03 12:14:26 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2016-05-24 23:03:00 +0100 |
| commit | b5f9820d905a275bc01bbffa9b4927ec11286f8d (patch) | |
| tree | 4392b5072ecfea01c232da8ab4af9bea5c7374a1 /src | |
| parent | bcf9e476532f12544d1831300dbb2caa1e7c0bdf (diff) | |
mesa_glinterop: remove unneeded GLAPI/GLAPIENTRY/APIENTRYP symbols
These come from windows.h, gl.h, glcorearb.h and/or glext.h.
The interop interface is aimed at non-Windows platforms while the macros
are used/derived due to Windows specifics. Thus we can safely remove
them.
Strictly speaking there should be GLXAPIENTRY/EGLAPIENTRY and alike
macros, although a) there is no GLX ones and b) this brings us even
further from decoupling the file from the GLX/EGL header dependency.
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
Tested-by: Tom Stellard <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/main/eglapi.c | 4 | ||||
| -rw-r--r-- | src/glx/glxcmds.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c index be2c90f6bdc..c8d7c23944a 100644 --- a/src/egl/main/eglapi.c +++ b/src/egl/main/eglapi.c @@ -1937,7 +1937,7 @@ _eglLockDisplayInterop(EGLDisplay dpy, EGLContext context, return MESA_GLINTEROP_SUCCESS; } -GLAPI int GLAPIENTRY +int MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, mesa_glinterop_device_info *out) { @@ -1959,7 +1959,7 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, return ret; } -GLAPI int GLAPIENTRY +int MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context, const mesa_glinterop_export_in *in, mesa_glinterop_export_out *out) diff --git a/src/glx/glxcmds.c b/src/glx/glxcmds.c index 46bc214081a..b651953cf9c 100644 --- a/src/glx/glxcmds.c +++ b/src/glx/glxcmds.c @@ -2695,7 +2695,7 @@ __glXGetUST(int64_t * ust) #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) -GLAPI int GLAPIENTRY +int MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, mesa_glinterop_device_info *out) { @@ -2719,7 +2719,7 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, return ret; } -GLAPI int GLAPIENTRY +int MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, const mesa_glinterop_export_in *in, mesa_glinterop_export_out *out) |