more GL 1.3 and GLX 1.4 updates

diff --git a/include/GL/glx.h b/include/GL/glx.h
index ee97844a5129c55ca2b3cdfeab2a7077eee2e66e..9d0b60fceaae3f2b454920091baee7289af3964a 100644 (file)
--- a/include/GL/glx.h
+++ b/include/GL/glx.h
@@ -1,4 +1,4 @@
-/* $Id: glx.h,v 1.30 2001/09/01 20:17:16 brianp Exp $ */
+/* $Id: glx.h,v 1.31 2001/09/14 02:43:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -60,6 +60,7 @@ extern "C" {
 #define GLX_VERSION_1_1                1
 #define GLX_VERSION_1_2                1
 #define GLX_VERSION_1_3                1
+#define GLX_VERSION_1_4                1
 
 #define GLX_EXTENSION_NAME   "GLX"
 
@@ -169,6 +170,13 @@ extern "C" {
 #define GLX_PBUFFER_WIDTH               0x8041
 
 
+/*
+ * GLX 1.4 and later:
+ */
+#define GLX_SAMPLE_BUFFERS_SGIS            100000
+#define GLX_SAMPLES_SGIS                   100001
+
+
 
 typedef struct __GLXcontextRec *GLXContext;
 typedef XID GLXPixmap;
@@ -286,6 +294,10 @@ extern void glXGetSelectedEvent( Display *dpy, GLXDrawable drawable,
                                  unsigned long *mask );
 
 
+/* GLX 1.4 and later */
+extern void (*glXGetProcAddress(const GLubyte *procname))();
+
+
 
 #ifndef GLX_GLXEXT_LEGACY
 

diff --git a/src/mesa/Makefile.X11 b/src/mesa/Makefile.X11
index 28980575a530d4e1652ecc6c9ea42d487e66c531..b5cc095a532f638dd80e50e78f0b27bbe890367a 100644 (file)
--- a/src/mesa/Makefile.X11
+++ b/src/mesa/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.56 2001/07/12 22:09:21 keithw Exp $
+# $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
+# Version:  3.5.1
 # Copyright (C) 1995-2001  Brian Paul
 
 # Makefile for core library
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 GL_MAJOR = 1
-GL_MINOR = 2
+GL_MINOR = 3
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS

diff --git a/src/mesa/drivers/x11/fakeglx.c b/src/mesa/drivers/x11/fakeglx.c
index 78bc14880e994871926ca52d086acc4dbc1fe342..7309fb8ad83ec7f060d14cf9f03889c75edd1a0d 100644 (file)
--- a/src/mesa/drivers/x11/fakeglx.c
+++ b/src/mesa/drivers/x11/fakeglx.c
@@ -1,4 +1,4 @@
-/* $Id: fakeglx.c,v 1.56 2001/09/01 20:23:25 brianp Exp $ */
+/* $Id: fakeglx.c,v 1.57 2001/09/14 02:43:04 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -57,13 +57,13 @@
 
 /* This indicates the client-side GLX API and GLX encoder version. */
 #define CLIENT_MAJOR_VERSION 1
-#define CLIENT_MINOR_VERSION 2
+#define CLIENT_MINOR_VERSION 2  /* don't have 1.3's pbuffers, etc yet */
 
 /* This indicates the server-side GLX decoder version.
- * GLX 1.3 indicates OpenGL 1.2 support
+ * GLX 1.4 indicates OpenGL 1.3 support
  */
 #define SERVER_MAJOR_VERSION 1
-#define SERVER_MINOR_VERSION 3
+#define SERVER_MINOR_VERSION 4
 
 /* This is appended onto the glXGetClient/ServerString version strings. */
 #define MESA_GLX_VERSION "Mesa 3.5.1"

diff --git a/src/mesa/drivers/x11/glxapi.c b/src/mesa/drivers/x11/glxapi.c
index 53246f64f409aecde532a32b4c843390eda85611..f0fd85333c14acd3395be5b4953cc4dc51abb5de 100644 (file)
--- a/src/mesa/drivers/x11/glxapi.c
+++ b/src/mesa/drivers/x11/glxapi.c
@@ -1,4 +1,4 @@
-/* $Id: glxapi.c,v 1.27 2001/05/29 23:15:07 brianp Exp $ */
+/* $Id: glxapi.c,v 1.28 2001/09/14 02:43:03 brianp Exp $ */
 
 /*
  * Mesa 3-D graphics library
@@ -1253,6 +1253,9 @@ static struct name_address_pair GLX_functions[] = {
    { "glXQueryDrawable", (GLvoid *) glXQueryDrawable },
    { "glXSelectEvent", (GLvoid *) glXSelectEvent },
 
+   /*** GLX_VERSION_1_4 ***/
+   { "glXGetProcAddress", (GLvoid *) glXGetProcAddress },
+
    /*** GLX_SGI_swap_control ***/
    { "glXSwapIntervalSGI", (GLvoid *) glXSwapIntervalSGI },
 
@@ -1370,3 +1373,10 @@ void (*glXGetProcAddressARB(const GLubyte *procName))()
    f = (gl_function) _glapi_get_proc_address((const char *) procName);
    return f;
 }
+
+
+/* GLX 1.4 */
+void (*glXGetProcAddress(const GLubyte *procName))()
+{
+   return glXGetProcAddressARB(procName);
+}

diff --git a/src/mesa/main/Makefile.X11 b/src/mesa/main/Makefile.X11
index 28980575a530d4e1652ecc6c9ea42d487e66c531..b5cc095a532f638dd80e50e78f0b27bbe890367a 100644 (file)
--- a/src/mesa/main/Makefile.X11
+++ b/src/mesa/main/Makefile.X11
@@ -1,7 +1,7 @@
-# $Id: Makefile.X11,v 1.56 2001/07/12 22:09:21 keithw Exp $
+# $Id: Makefile.X11,v 1.57 2001/09/14 02:43:03 brianp Exp $
 
 # Mesa 3-D graphics library
-# Version:  3.5
+# Version:  3.5.1
 # Copyright (C) 1995-2001  Brian Paul
 
 # Makefile for core library
@@ -10,7 +10,7 @@
 ##### MACROS #####
 
 GL_MAJOR = 1
-GL_MINOR = 2
+GL_MINOR = 3
 GL_TINY = 0$(MESA_MAJOR)0$(MESA_MINOR)0$(MESA_TINY)
 
 VPATH = RCS