Skip to content

Commit 0664db1

Browse files
e4te4t
committed
Merging XORG-CURRENT into trunk
1 parent 9d24a5f commit 0664db1

File tree

265 files changed

+1251
-313
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

265 files changed

+1251
-313
lines changed

‎GL/apple/aglGlx.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
* holders shall not be used in advertising or otherwise to promote the sale,
3333
* use or other dealings in this Software without prior written authorization.
3434
*/
35-
/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
35+
/* $XFree86: xc/programs/Xserver/GL/apple/aglGlx.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
3636

3737
#include "quartzCommon.h"
3838
#include <AGL/agl.h>

‎GL/apple/indirect.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
* holders shall not be used in advertising or otherwise to promote the sale,
3535
* use or other dealings in this Software without prior written authorization.
3636
*/
37-
/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.3 2003/10/13 00:30:54 torrey Exp $ */
37+
/* $XFree86: xc/programs/Xserver/GL/apple/indirect.c,v 1.2 2003/09/16 00:36:11 torrey Exp $ */
3838

3939
#include "dri.h"
4040
#include "quartz.h"

‎GL/glx/g_disptab.c

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

‎GL/glx/g_disptab.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab.h,v 1.4 2003/09/28 20:15:42 alanh Exp $ */
22
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
33
#ifndef _GLX_g_disptab_h_
44
#define _GLX_g_disptab_h_

‎GL/glx/g_disptab_EXT.c

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

‎GL/glx/g_disptab_EXT.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.6 2004/02/12 02:25:01 torrey Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/g_disptab_EXT.h,v 1.5 2004/01/28 18:11:50 alanh Exp $ */
22
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
33
#ifndef _GLX_g_disptab_EXT_h_
44
#define _GLX_g_disptab_EXT_h_

‎GL/glx/g_render.c

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.10 2004/03/10 18:08:01 tsi Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/g_render.c,v 1.8 2004/02/03 21:34:36 alanh Exp $ */
22
/* DO NOT EDIT - THIS FILE IS AUTOMATICALLY GENERATED */
33
/*
44
** License Applicability. Except to the extent portions of this file are
@@ -68,21 +68,11 @@ void __glXDisp_Begin(GLbyte *pc)
6868
#define __GLX_SWAP_GLdouble(ptr) __GLX_SWAP_DOUBLE(ptr)
6969
#define __GLX_SWAP_GLfloat(ptr) __GLX_SWAP_FLOAT(ptr)
7070

71-
#define __GLX_DECLARE_SWAP_GLbyte_ARRAY
72-
#define __GLX_DECLARE_SWAP_GLshort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
73-
#define __GLX_DECLARE_SWAP_GLint_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
74-
#define __GLX_DECLARE_SWAP_GLenum_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
75-
#define __GLX_DECLARE_SWAP_GLubyte_ARRAY
76-
#define __GLX_DECLARE_SWAP_GLushort_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
77-
#define __GLX_DECLARE_SWAP_GLuint_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
78-
#define __GLX_DECLARE_SWAP_GLdouble_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
79-
#define __GLX_DECLARE_SWAP_GLfloat_ARRAY __GLX_DECLARE_SWAP_ARRAY_VARIABLES
80-
81-
#define __GLX_SWAP_GLbyte_ARRAY(ptr,count)
71+
#define __GLX_SWAP_GLbyte_ARRAY(ptr,count) (void) swapEnd; (void) swapPC; (void) sw;
8272
#define __GLX_SWAP_GLshort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count)
8373
#define __GLX_SWAP_GLint_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count)
8474
#define __GLX_SWAP_GLenum_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count)
85-
#define __GLX_SWAP_GLubyte_ARRAY(ptr,count)
75+
#define __GLX_SWAP_GLubyte_ARRAY(ptr,count) (void) swapEnd; (void) swapPC; (void) sw;
8676
#define __GLX_SWAP_GLushort_ARRAY(ptr,count) __GLX_SWAP_SHORT_ARRAY(ptr,count)
8777
#define __GLX_SWAP_GLuint_ARRAY(ptr,count) __GLX_SWAP_INT_ARRAY(ptr,count)
8878
#define __GLX_SWAP_GLdouble_ARRAY(ptr,count) __GLX_SWAP_DOUBLE_ARRAY(ptr,count)
@@ -125,12 +115,28 @@ void __glXDisp_Begin(GLbyte *pc)
125115
} \
126116
void __glXDispSwap_ ## name ( GLbyte * pc ) \
127117
{ \
128-
__GLX_DECLARE_SWAP_ ## type ## _ARRAY; \
118+
__GLX_DECLARE_SWAP_VARIABLES; \
119+
__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
129120
GLX_DO_ALIGN_MAGIC( 3, type ); \
130121
__GLX_SWAP_ ## type ## _ARRAY(pc, 3); \
131122
gl ## name ( (type *) pc ); \
132123
}
133124

125+
#define dispatch_template_4( name, type ) \
126+
void __glXDisp_ ## name ( GLbyte * pc ) \
127+
{ \
128+
GLX_DO_ALIGN_MAGIC( 4, type ); \
129+
gl ## name ( (type *) pc ); \
130+
} \
131+
void __glXDispSwap_ ## name ( GLbyte * pc ) \
132+
{ \
133+
__GLX_DECLARE_SWAP_VARIABLES; \
134+
__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
135+
GLX_DO_ALIGN_MAGIC( 4, type ); \
136+
__GLX_SWAP_ ## type ## _ARRAY(pc, 4); \
137+
gl ## name ( (type *) pc ); \
138+
}
139+
134140
#define dispatch_template_4s( name, type ) \
135141
void __glXDisp_ ## name ( GLbyte * pc ) \
136142
{ \
@@ -140,7 +146,8 @@ void __glXDisp_Begin(GLbyte *pc)
140146
} \
141147
void __glXDispSwap_ ## name ( GLbyte * pc ) \
142148
{ \
143-
__GLX_DECLARE_SWAP_ ##type ## _ARRAY; \
149+
__GLX_DECLARE_SWAP_VARIABLES; \
150+
__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
144151
GLX_DO_ALIGN_MAGIC( 4, type ); \
145152
__GLX_SWAP_ ## type ## _ARRAY(pc, 4); \
146153
gl ## name ( ((type *) pc)[0], ((type *) pc)[1], \
@@ -177,7 +184,8 @@ void __glXDisp_Begin(GLbyte *pc)
177184
void __glXDispSwap_ ## name ( GLbyte * pc ) \
178185
{ \
179186
GLenum pname; GLint compsize; \
180-
__GLX_DECLARE_SWAP_ ## type ## _ARRAY; \
187+
__GLX_DECLARE_SWAP_VARIABLES; \
188+
__GLX_DECLARE_SWAP_ARRAY_VARIABLES; \
181189
__GLX_SWAP_INT(pc + 0); \
182190
pname = *(GLenum *)(pc + 0); \
183191
compsize = __gl ## name ## _size(pname); \

0 commit comments

Comments
 (0)