merged r200-0-2-branch to trunk

1 files changed, 34 insertions, 7 deletions

diff --git a/xc/include/GL/glx.h b/xc/include/GL/glx.h
index becfb864d..05300fc86 100644
--- a/xc/include/GL/glx.h
+++ b/xc/include/GL/glx.h
@@ -112,13 +112,6 @@ extern void glXGetSelectedEvent (Display *dpy, GLXDrawable draw, unsigned long *
 extern void (*glXGetProcAddress(const GLubyte *procname))(void);
 
 
-/* AGP memory allocation */
-extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-extern void glXFreeMemoryNV(GLvoid *pointer);
-typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
-typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
-
-
 #ifndef GLX_GLXEXT_LEGACY
 
 #include <GL/glxext.h>
@@ -141,6 +134,40 @@ extern void (*glXGetProcAddressARB(const GLubyte *procName))( void );
 
 #endif /* GLX_GLXEXT_LEGACY */
 
+
+/**
+ ** The following aren't in glxext.h yet.
+ **/
+
+
+/*
+ * ???. GLX_NV_vertex_array_range
+ */
+#ifndef GLX_NV_vertex_array_range
+#define GLX_NV_vertex_array_range
+
+extern void *glXAllocateMemoryNV(GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+extern void glXFreeMemoryNV(GLvoid *pointer);
+typedef void * ( * PFNGLXALLOCATEMEMORYNVPROC) (GLsizei size, GLfloat readfreq, GLfloat writefreq, GLfloat priority);
+typedef void ( * PFNGLXFREEMEMORYNVPROC) (GLvoid *pointer);
+
+#endif /* GLX_NV_vertex_array_range */
+
+
+
+/*
+ * ???. GLX_MESA_agp_offset
+ */ 
+#ifndef GLX_MESA_agp_offset
+#define GLX_MESA_agp_offset 1
+
+extern GLuint glXGetAGPOffsetMESA(const GLvoid *pointer);
+typedef GLuint (* PFNGLXGETAGPOFFSETMESAPROC) (const GLvoid *pointer);
+
+#endif /* GLX_MESA_agp_offset */
+
+
+
 /*** Should these go here, or in another header? */
 /*
 ** GLX Events