Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004

juergbi · Mar 14, 2004 · dae90c3 · dae90c3
1 parent 4e996f9
commit dae90c3
Show file tree

Hide file tree

Showing 1,323 changed files with 1,586 additions and 1,623 deletions.
diff --git a/GL/apple/aglGlx.c b/GL/apple/aglGlx.c
@@ -32,7 +32,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
 
 #include "quartzCommon.h"
 #include <AGL/agl.h>

diff --git a/GL/apple/indirect.c b/GL/apple/indirect.c
@@ -34,7 +34,7 @@
  * holders shall not be used in advertising or otherwise to promote the sale,
  * use or other dealings in this Software without prior written authorization.
  */
-/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
 
 #include "dri.h"
 #include "quartz.h"

diff --git a/GL/glx/g_disptab.c b/GL/glx/g_disptab.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are

diff --git a/GL/glx/g_disptab.h b/GL/glx/g_disptab.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_h_
 #define _GLX_g_disptab_h_

diff --git a/GL/glx/g_disptab_EXT.c b/GL/glx/g_disptab_EXT.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.c,v 1.6 2004/02/12 02:25:00 torrey Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are

diff --git a/GL/glx/g_disptab_EXT.h b/GL/glx/g_disptab_EXT.h
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 #ifndef _GLX_g_disptab_EXT_h_
 #define _GLX_g_disptab_EXT_h_

diff --git a/GL/glx/g_render.c b/GL/glx/g_render.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */
+/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.10 2004/03/10 18:08:01 tsi Exp $ */
 /* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
 /*
 ** License Applicability. Except to the extent portions of this file are
@@ -68,11 +68,21 @@ void __glXDisp_Begin(GLbyte *pc)
 #define __GLX_SWAP_GLdouble(ptr) __GLX_SWAP_DOUBLE(ptr)
 #define __GLX_SWAP_GLfloat(ptr)  __GLX_SWAP_FLOAT(ptr)
 
-#define __GLX_SWAP_GLbyte_ARRAY(ptr,count)   (void) swapEnd; (void) swapPC; (void) sw;
+#define __GLX_DECLARE_SWAP_GLbyte_ARRAY
+#define __GLX_DECLARE_SWAP_GLshort_ARRAY  __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+#define __GLX_DECLARE_SWAP_GLint_ARRAY    __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+#define __GLX_DECLARE_SWAP_GLenum_ARRAY   __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+#define __GLX_DECLARE_SWAP_GLubyte_ARRAY
+#define __GLX_DECLARE_SWAP_GLushort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+#define __GLX_DECLARE_SWAP_GLuint_ARRAY   __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+#define __GLX_DECLARE_SWAP_GLdouble_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+#define __GLX_DECLARE_SWAP_GLfloat_ARRAY  __GLX_DECLARE_SWAP_ARRAY_VARIABLES
+
+#define __GLX_SWAP_GLbyte_ARRAY(ptr,count)
 #define __GLX_SWAP_GLshort_ARRAY(ptr,count)  __GLX_SWAP_SHORT_ARRAY(ptr,count)
 #define __GLX_SWAP_GLint_ARRAY(ptr,count)    __GLX_SWAP_INT_ARRAY(ptr,count)
 #define __GLX_SWAP_GLenum_ARRAY(ptr,count)   __GLX_SWAP_INT_ARRAY(ptr,count)
-#define __GLX_SWAP_GLubyte_ARRAY(ptr,count)  (void) swapEnd; (void) swapPC; (void) sw;
+#define __GLX_SWAP_GLubyte_ARRAY(ptr,count)
 #define __GLX_SWAP_GLushort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count)
 #define __GLX_SWAP_GLuint_ARRAY(ptr,count)   __GLX_SWAP_INT_ARRAY(ptr,count)
 #define __GLX_SWAP_GLdouble_ARRAY(ptr,count) __GLX_SWAP_DOUBLE_ARRAY(ptr,count)
@@ -115,28 +125,12 @@ void __glXDisp_Begin(GLbyte *pc)
     } \
     void __glXDispSwap_ ## name ( GLbyte * pc ) \
     { \
-	__GLX_DECLARE_SWAP_VARIABLES; \
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
+	__GLX_DECLARE_SWAP_ ## type ## _ARRAY; \
 	GLX_DO_ALIGN_MAGIC( 3, type ); \
 	__GLX_SWAP_ ## type ## _ARRAY(pc, 3); \
 	gl ## name ( (type *) pc ); \
     }
 
-#define dispatch_template_4( name, type ) \
-    void __glXDisp_ ## name ( GLbyte * pc ) \
-    { \
-	GLX_DO_ALIGN_MAGIC( 4, type ); \
-	gl ## name ( (type *) pc ); \
-    } \
-    void __glXDispSwap_ ## name ( GLbyte * pc ) \
-    { \
-	__GLX_DECLARE_SWAP_VARIABLES; \
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
-	GLX_DO_ALIGN_MAGIC( 4, type ); \
-	__GLX_SWAP_ ## type ## _ARRAY(pc, 4); \
-	gl ## name ( (type *) pc ); \
-    }
-
 #define dispatch_template_4s( name, type ) \
     void __glXDisp_ ## name ( GLbyte * pc ) \
     { \
@@ -146,8 +140,7 @@ void __glXDisp_Begin(GLbyte *pc)
     } \
     void __glXDispSwap_ ## name ( GLbyte * pc ) \
     { \
-	__GLX_DECLARE_SWAP_VARIABLES; \
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
+	__GLX_DECLARE_SWAP_ ##type ## _ARRAY; \
 	GLX_DO_ALIGN_MAGIC( 4, type ); \
 	__GLX_SWAP_ ## type ## _ARRAY(pc, 4); \
 	gl ## name ( ((type *) pc)[0], ((type *) pc)[1], \
@@ -184,8 +177,7 @@ void __glXDisp_Begin(GLbyte *pc)
     void __glXDispSwap_ ## name ( GLbyte * pc ) \
     { \
 	GLenum pname; GLint compsize; \
-	__GLX_DECLARE_SWAP_VARIABLES; \
-	__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
+	__GLX_DECLARE_SWAP_ ## type ## _ARRAY; \
 	__GLX_SWAP_INT(pc + 0); \
 	pname = *(GLenum *)(pc + 0); \
 	compsize = __gl ## name ## _size(pname); \