From b5f9820d905a275bc01bbffa9b4927ec11286f8d Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Tue, 3 May 2016 12:14:26 +0100 Subject: mesa_glinterop: remove unneeded GLAPI/GLAPIENTRY/APIENTRYP symbols MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Marek Olšák Tested-by: Tom Stellard --- src/egl/main/eglapi.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/egl') 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) -- cgit v1.2.3