diff options
| author | Emil Velikov <emil.velikov@collabora.com> | 2016-05-03 12:14:26 +0100 |
|---|---|---|
| committer | Emil Velikov <emil.l.velikov@gmail.com> | 2016-05-24 23:03:00 +0100 |
| commit | b5f9820d905a275bc01bbffa9b4927ec11286f8d (patch) | |
| tree | 4392b5072ecfea01c232da8ab4af9bea5c7374a1 /include/GL | |
| parent | bcf9e476532f12544d1831300dbb2caa1e7c0bdf (diff) | |
| download | external_mesa3d-b5f9820d905a275bc01bbffa9b4927ec11286f8d.zip external_mesa3d-b5f9820d905a275bc01bbffa9b4927ec11286f8d.tar.gz external_mesa3d-b5f9820d905a275bc01bbffa9b4927ec11286f8d.tar.bz2 | |
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 <emil.velikov@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Tested-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'include/GL')
| -rw-r--r-- | include/GL/mesa_glinterop.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/include/GL/mesa_glinterop.h b/include/GL/mesa_glinterop.h index 7e57dda..ae71fea 100644 --- a/include/GL/mesa_glinterop.h +++ b/include/GL/mesa_glinterop.h @@ -229,7 +229,7 @@ typedef struct _mesa_glinterop_export_out { * * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error */ -GLAPI int GLAPIENTRY +int MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, mesa_glinterop_device_info *out); @@ -238,7 +238,7 @@ MesaGLInteropGLXQueryDeviceInfo(Display *dpy, GLXContext context, * Same as MesaGLInteropGLXQueryDeviceInfo except that it accepts EGLDisplay * and EGLContext. */ -GLAPI int GLAPIENTRY +int MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, mesa_glinterop_device_info *out); @@ -254,7 +254,7 @@ MesaGLInteropEGLQueryDeviceInfo(EGLDisplay dpy, EGLContext context, * * \return MESA_GLINTEROP_SUCCESS or MESA_GLINTEROP_* != 0 on error */ -GLAPI int GLAPIENTRY +int MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, const mesa_glinterop_export_in *in, mesa_glinterop_export_out *out); @@ -264,22 +264,22 @@ MesaGLInteropGLXExportObject(Display *dpy, GLXContext context, * Same as MesaGLInteropGLXExportObject except that it accepts * EGLDisplay and EGLContext. */ -GLAPI int GLAPIENTRY +int MesaGLInteropEGLExportObject(EGLDisplay dpy, EGLContext context, const mesa_glinterop_export_in *in, mesa_glinterop_export_out *out); -typedef int (APIENTRYP PFNMESAGLINTEROPGLXQUERYDEVICEINFOPROC)(Display *dpy, GLXContext context, - mesa_glinterop_device_info *out); -typedef int (APIENTRYP PFNMESAGLINTEROPEGLQUERYDEVICEINFOPROC)(EGLDisplay dpy, EGLContext context, - mesa_glinterop_device_info *out); -typedef int (APIENTRYP PFNMESAGLINTEROPGLXEXPORTOBJECTPROC)(Display *dpy, GLXContext context, - const mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out); -typedef int (APIENTRYP PFNMESAGLINTEROPEGLEXPORTOBJECTPROC)(EGLDisplay dpy, EGLContext context, - const mesa_glinterop_export_in *in, - mesa_glinterop_export_out *out); +typedef int (PFNMESAGLINTEROPGLXQUERYDEVICEINFOPROC)(Display *dpy, GLXContext context, + mesa_glinterop_device_info *out); +typedef int (PFNMESAGLINTEROPEGLQUERYDEVICEINFOPROC)(EGLDisplay dpy, EGLContext context, + mesa_glinterop_device_info *out); +typedef int (PFNMESAGLINTEROPGLXEXPORTOBJECTPROC)(Display *dpy, GLXContext context, + const mesa_glinterop_export_in *in, + mesa_glinterop_export_out *out); +typedef int (PFNMESAGLINTEROPEGLEXPORTOBJECTPROC)(EGLDisplay dpy, EGLContext context, + const mesa_glinterop_export_in *in, + mesa_glinterop_export_out *out); #ifdef __cplusplus } |