import Mesa 11.0.6

1 files changed, 2 insertions, 32 deletions

diff --git a/lib/mesa/src/glx/glxclient.h b/lib/mesa/src/glx/glxclient.h
index 0d29e5635..2776b44a9 100644
--- a/lib/mesa/src/glx/glxclient.h
+++ b/lib/mesa/src/glx/glxclient.h
@@ -56,16 +56,6 @@
 
 #include "glxextensions.h"
 
-#if defined(USE_LIBGLVND)
-#define _GLX_PUBLIC _X_HIDDEN
-#else
-#define _GLX_PUBLIC _X_EXPORT
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 
 #define GLX_MAJOR_VERSION 1       /* current version numbers */
 #define GLX_MINOR_VERSION 4
@@ -154,15 +144,11 @@ struct __GLXDRIdrawableRec
 extern __GLXDRIdisplay *driswCreateDisplay(Display * dpy);
 extern __GLXDRIdisplay *driCreateDisplay(Display * dpy);
 extern __GLXDRIdisplay *dri2CreateDisplay(Display * dpy);
-extern __GLXDRIdisplay *dri3_create_display(Display * dpy);
-extern __GLXDRIdisplay *driwindowsCreateDisplay(Display * dpy);
-
-/*
-**
-*/
 extern void dri2InvalidateBuffers(Display *dpy, XID drawable);
 extern unsigned dri2GetSwapEventType(Display *dpy, XID drawable);
 
+extern __GLXDRIdisplay *dri3_create_display(Display * dpy);
+
 /*
 ** Functions to obtain driver configuration information from a direct
 ** rendering client application
@@ -222,10 +208,6 @@ typedef struct __GLXattributeMachineRec
    __GLXattribute **stackPointer;
 } __GLXattributeMachine;
 
-struct mesa_glinterop_device_info;
-struct mesa_glinterop_export_in;
-struct mesa_glinterop_export_out;
-
 struct glx_context_vtable {
    void (*destroy)(struct glx_context *ctx);
    int (*bind)(struct glx_context *context, struct glx_context *old,
@@ -240,11 +222,6 @@ struct glx_context_vtable {
 			  int buffer, const int *attrib_list);
    void (*release_tex_image)(Display * dpy, GLXDrawable drawable, int buffer);
    void * (*get_proc_address)(const char *symbol);
-   int (*interop_query_device_info)(struct glx_context *ctx,
-                                    struct mesa_glinterop_device_info *out);
-   int (*interop_export_object)(struct glx_context *ctx,
-                                struct mesa_glinterop_export_in *in,
-                                struct mesa_glinterop_export_out *out);
 };
 
 /**
@@ -610,9 +587,6 @@ struct glx_display
    __GLXDRIdisplay *dri2Display;
    __GLXDRIdisplay *dri3Display;
 #endif
-#ifdef GLX_USE_WINDOWSGL
-   __GLXDRIdisplay *windowsdriDisplay;
-#endif
 };
 
 struct glx_drawable {
@@ -841,8 +815,4 @@ indirect_create_context_attribs(struct glx_screen *base,
                                 const uint32_t *attribs,
                                 unsigned *error);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* !__GLX_client_h__ */