OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa_glinterop: remove unneeded GLAPI/GLAPIENTRY/APIENTRYP symbols

Browse Source 
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 <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
This commit is contained in:
Emil Velikov
2016-05-03 12:14:26 +01:00
committed by Emil Velikov
parent bcf9e47653
commit b5f9820d90
3 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
include/GL/mesa_glinterop.h
View File

@@ -229,7 +229,7 @@ typedef struct _mesa_glinterop_export_out {
* *
* \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error
*/ */
GLAPI int GLAPIENTRY int
MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
mesa_glinterop_device_info *out); mesa_glinterop_device_info *out);
@@ -238,7 +238,7 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
* Same as MesaGLInteropGLXQueryDeviceInfo except that it accepts EGLDisplay * Same as MesaGLInteropGLXQueryDeviceInfo except that it accepts EGLDisplay
* and EGLContext. * and EGLContext.
*/ */
GLAPI int GLAPIENTRY int
MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context,
mesa_glinterop_device_info *out); mesa_glinterop_device_info *out);
@@ -254,7 +254,7 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context,
* *
* \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error
*/ */
GLAPI int GLAPIENTRY int
MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
const mesa_glinterop_export_in *in, const mesa_glinterop_export_in *in,
mesa_glinterop_export_out *out); mesa_glinterop_export_out *out);
@@ -264,22 +264,22 @@ MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
* Same as MesaGLInteropGLXExportObject except that it accepts * Same as MesaGLInteropGLXExportObject except that it accepts
* EGLDisplay and EGLContext. * EGLDisplay and EGLContext.
*/ */
GLAPI int GLAPIENTRY int
MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context, MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context,
const mesa_glinterop_export_in *in, const mesa_glinterop_export_in *in,
mesa_glinterop_export_out *out); mesa_glinterop_export_out *out);
typedef int (APIENTRYP PFNMESAGLINTEROPGLXQUERYDEVICEINFOPROC)(Display *dpy, GLXContext context, typedef int (PFNMESAGLINTEROPGLXQUERYDEVICEINFOPROC)(Display *dpy, GLXContext context,
mesa_glinterop_device_info *out); mesa_glinterop_device_info *out);
typedef int (APIENTRYP PFNMESAGLINTEROPEGLQUERYDEVICEINFOPROC)(EGLDisplay dpy, EGLContext context, typedef int (PFNMESAGLINTEROPEGLQUERYDEVICEINFOPROC)(EGLDisplay dpy, EGLContext context,
mesa_glinterop_device_info *out); mesa_glinterop_device_info *out);
typedef int (APIENTRYP PFNMESAGLINTEROPGLXEXPORTOBJECTPROC)(Display *dpy, GLXContext context, typedef int (PFNMESAGLINTEROPGLXEXPORTOBJECTPROC)(Display *dpy, GLXContext context,
const mesa_glinterop_export_in *in, const mesa_glinterop_export_in *in,
mesa_glinterop_export_out *out); mesa_glinterop_export_out *out);
typedef int (APIENTRYP PFNMESAGLINTEROPEGLEXPORTOBJECTPROC)(EGLDisplay dpy, EGLContext context, typedef int (PFNMESAGLINTEROPEGLEXPORTOBJECTPROC)(EGLDisplay dpy, EGLContext context,
const mesa_glinterop_export_in *in, const mesa_glinterop_export_in *in,
mesa_glinterop_export_out *out); mesa_glinterop_export_out *out);
#ifdef __cplusplus #ifdef __cplusplus
} }

4
src/egl/main/eglapi.c
View File

@@ -1937,7 +1937,7 @@ _eglLockDisplayInterop(EGLDisplay dpy, EGLContext context,
return MESA_GLINTEROP_SUCCESS; return MESA_GLINTEROP_SUCCESS;
} }
GLAPI int GLAPIENTRY int
MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context,
mesa_glinterop_device_info *out) mesa_glinterop_device_info *out)
{ {
@@ -1959,7 +1959,7 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context,
return ret; return ret;
} }
GLAPI int GLAPIENTRY int
MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context, MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context,
const mesa_glinterop_export_in *in, const mesa_glinterop_export_in *in,
mesa_glinterop_export_out *out) mesa_glinterop_export_out *out)

4
src/glx/glxcmds.c
View File

@@ -2695,7 +2695,7 @@ __glXGetUST(int64_t * ust)
#if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL) #if defined(GLX_DIRECT_RENDERING) && !defined(GLX_USE_APPLEGL)
GLAPI int GLAPIENTRY int
MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
mesa_glinterop_device_info *out) mesa_glinterop_device_info *out)
{ {
@@ -2719,7 +2719,7 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context,
return ret; return ret;
} }
GLAPI int GLAPIENTRY int
MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, MesaGLInteropGLXExportObject(Display *dpy, GLXContext context,
const mesa_glinterop_export_in *in, const mesa_glinterop_export_in *in,
mesa_glinterop_export_out *out) mesa_glinterop_export_out *out)