aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/glx/x11/Makefile1
-rw-r--r--src/glx/x11/dri2.c3
-rw-r--r--src/glx/x11/dri2_glx.c1
-rw-r--r--src/glx/x11/dri_common.c2
-rw-r--r--src/glx/x11/dri_glx.c1
-rw-r--r--src/glx/x11/drisw_glx.c1
-rw-r--r--src/glx/x11/glx_pbuffer.c1
-rw-r--r--src/glx/x11/glxclient.h17
-rw-r--r--src/glx/x11/glxcmds.c1
-rw-r--r--src/glx/x11/glxcurrent.c1
-rw-r--r--src/glx/x11/glxext.c2
-rw-r--r--src/glx/x11/glxextensions.c2
-rw-r--r--src/glx/x11/indirect_vertex_program.c1
-rw-r--r--src/glx/x11/pixelstore.c1
-rw-r--r--src/glx/x11/singlepix.c1
15 files changed, 21 insertions, 15 deletions
diff --git a/src/glx/x11/Makefile b/src/glx/x11/Makefile
index 5d9c61c983a..8d4a23ff174 100644
--- a/src/glx/x11/Makefile
+++ b/src/glx/x11/Makefile
@@ -50,7 +50,6 @@ OBJECTS = $(SOURCES:.c=.o) $(MESA_GLAPI_OBJECTS)
INCLUDES = -I. \
-I$(TOP)/include \
-I$(TOP)/include/GL/internal \
- -I$(TOP)/src/mesa/main \
-I$(TOP)/src/mesa/glapi \
$(LIBDRM_CFLAGS) \
$(DRI2PROTO_CFLAGS) \
diff --git a/src/glx/x11/dri2.c b/src/glx/x11/dri2.c
index dc60af90c15..5acf7ac5311 100644
--- a/src/glx/x11/dri2.c
+++ b/src/glx/x11/dri2.c
@@ -36,7 +36,6 @@
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
#include <X11/extensions/dri2proto.h>
-#include "glheader.h"
#include "xf86drm.h"
#include "dri2.h"
@@ -289,7 +288,7 @@ void DRI2DestroyDrawable(Display *dpy, XID drawable)
XextSimpleCheckExtension (dpy, info, dri2ExtensionName);
- XSync(dpy, GL_FALSE);
+ XSync(dpy, False);
LockDisplay(dpy);
GetReq(DRI2DestroyDrawable, req);
diff --git a/src/glx/x11/dri2_glx.c b/src/glx/x11/dri2_glx.c
index 3c366bfa1e4..ed9054627fa 100644
--- a/src/glx/x11/dri2_glx.c
+++ b/src/glx/x11/dri2_glx.c
@@ -35,7 +35,6 @@
#include <X11/Xlib.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xdamage.h>
-#include "glheader.h"
#include "glxclient.h"
#include "glcontextmodes.h"
#include "xf86dri.h"
diff --git a/src/glx/x11/dri_common.c b/src/glx/x11/dri_common.c
index 8175f46c547..fbce6ac3e3d 100644
--- a/src/glx/x11/dri_common.c
+++ b/src/glx/x11/dri_common.c
@@ -37,7 +37,7 @@
#include <unistd.h>
#include <dlfcn.h>
-#include "glheader.h"
+#include <stdarg.h>
#include "glxclient.h"
#include "glcontextmodes.h"
#include "dri_common.h"
diff --git a/src/glx/x11/dri_glx.c b/src/glx/x11/dri_glx.c
index 39bf6c430b0..47203f50087 100644
--- a/src/glx/x11/dri_glx.c
+++ b/src/glx/x11/dri_glx.c
@@ -37,7 +37,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#include <X11/Xlib.h>
#include <X11/extensions/Xfixes.h>
#include <X11/extensions/Xdamage.h>
-#include "glheader.h"
#include "glxclient.h"
#include "glcontextmodes.h"
#include "xf86dri.h"
diff --git a/src/glx/x11/drisw_glx.c b/src/glx/x11/drisw_glx.c
index ad7b5ebd0c4..7bb4794f30c 100644
--- a/src/glx/x11/drisw_glx.c
+++ b/src/glx/x11/drisw_glx.c
@@ -24,7 +24,6 @@
#ifdef GLX_DIRECT_RENDERING
#include <X11/Xlib.h>
-#include "glheader.h"
#include "glxclient.h"
#include "glcontextmodes.h"
#include <dlfcn.h>
diff --git a/src/glx/x11/glx_pbuffer.c b/src/glx/x11/glx_pbuffer.c
index 0f878f223f8..fb2610a4900 100644
--- a/src/glx/x11/glx_pbuffer.c
+++ b/src/glx/x11/glx_pbuffer.c
@@ -38,7 +38,6 @@
#include "glapi.h"
#include "glxextensions.h"
#include "glcontextmodes.h"
-#include "glheader.h"
/**
diff --git a/src/glx/x11/glxclient.h b/src/glx/x11/glxclient.h
index 412511247ef..b10c2ae17b4 100644
--- a/src/glx/x11/glxclient.h
+++ b/src/glx/x11/glxclient.h
@@ -68,6 +68,23 @@
#include "glxextensions.h"
+
+/* If we build the library with gcc's -fvisibility=hidden flag, we'll
+ * use the PUBLIC macro to mark functions that are to be exported.
+ *
+ * We also need to define a USED attribute, so the optimizer doesn't
+ * inline a static function that we later use in an alias. - ajax
+ */
+#if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
+# define PUBLIC __attribute__((visibility("default")))
+# define USED __attribute__((used))
+#else
+# define PUBLIC
+# define USED
+#endif
+
+
+
#define GLX_MAJOR_VERSION 1 /* current version numbers */
#define GLX_MINOR_VERSION 4
diff --git a/src/glx/x11/glxcmds.c b/src/glx/x11/glxcmds.c
index 9197130dcaa..bb0e53cee3e 100644
--- a/src/glx/x11/glxcmds.c
+++ b/src/glx/x11/glxcmds.c
@@ -43,7 +43,6 @@
#include "glapi.h"
#include "glxextensions.h"
#include "glcontextmodes.h"
-#include "glheader.h"
#ifdef GLX_DIRECT_RENDERING
#include <sys/time.h>
diff --git a/src/glx/x11/glxcurrent.c b/src/glx/x11/glxcurrent.c
index 0d0c419a846..61cd9b39eaa 100644
--- a/src/glx/x11/glxcurrent.c
+++ b/src/glx/x11/glxcurrent.c
@@ -40,7 +40,6 @@
#include "glxclient.h"
#include "glapi.h"
-#include "glheader.h"
#include "indirect_init.h"
#ifdef GLX_DIRECT_RENDERING
diff --git a/src/glx/x11/glxext.c b/src/glx/x11/glxext.c
index 0d6d25ef3e4..370a429f620 100644
--- a/src/glx/x11/glxext.c
+++ b/src/glx/x11/glxext.c
@@ -44,13 +44,13 @@
* \author Kevin E. Martin <[email protected]>
*/
+#include <assert.h>
#include "glxclient.h"
#include <X11/extensions/Xext.h>
#include <X11/extensions/extutil.h>
#include "glapi.h"
#include "glxextensions.h"
#include "glcontextmodes.h"
-#include "glheader.h"
#ifdef USE_XCB
#include <X11/Xlib-xcb.h>
diff --git a/src/glx/x11/glxextensions.c b/src/glx/x11/glxextensions.c
index e8437184722..f2b169a0e40 100644
--- a/src/glx/x11/glxextensions.c
+++ b/src/glx/x11/glxextensions.c
@@ -34,7 +34,7 @@
#include <string.h>
#include "glapi.h"
#include "glxextensions.h"
-#include "simple_list.h"
+
#define SET_BIT(m,b) (m[ (b) / 8 ] |= (1U << ((b) % 8)))
#define CLR_BIT(m,b) (m[ (b) / 8 ] &= ~(1U << ((b) % 8)))
diff --git a/src/glx/x11/indirect_vertex_program.c b/src/glx/x11/indirect_vertex_program.c
index 4f1485a850c..0a1091eaefc 100644
--- a/src/glx/x11/indirect_vertex_program.c
+++ b/src/glx/x11/indirect_vertex_program.c
@@ -23,7 +23,6 @@
* SOFTWARE.
*/
-#include "glheader.h"
#include <inttypes.h>
#include <GL/gl.h>
#include "indirect.h"
diff --git a/src/glx/x11/pixelstore.c b/src/glx/x11/pixelstore.c
index 8431b29e906..3bf1b35ba3c 100644
--- a/src/glx/x11/pixelstore.c
+++ b/src/glx/x11/pixelstore.c
@@ -34,7 +34,6 @@
**
*/
-#include "glheader.h"
#include "glxclient.h"
#include "indirect.h"
diff --git a/src/glx/x11/singlepix.c b/src/glx/x11/singlepix.c
index 77bd4a65ed8..d8ad2b1bf04 100644
--- a/src/glx/x11/singlepix.c
+++ b/src/glx/x11/singlepix.c
@@ -34,7 +34,6 @@
**
*/
-#include "glheader.h"
#include "packsingle.h"
#include "indirect.h"
#include "dispatch.h"
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-30 05:29:44 +0000