Skip to content

Commit 6ff8c33

Browse files
author
Eric Anholt
committed
- Commit WIP of an integration of the Composite extension and a
 DDX-independent Composite wrapper. It's quite incomplete. Notably, the Render extension isn't wrapped properly or even completely wrapped improperly. - Rename COMPOSITE enum in smi driver to avoid conflict with new define. - Fix REGION_INIT usage of Damage so that it doesn't crash on first use. - Fix some apparent mismerges of XFIXES. - Fix some whitespace from DAMAGE-XFIXES merge that appears different from both xserver CVS and surrounding style.
1 parent 854c1af commit 6ff8c33

File tree

402 files changed

+4892
-86785
lines changed

Some content is hidden

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

402 files changed

+4892
-86785
lines changed

‎GL/glx/g_disptab_EXT.c

+61-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.3 2001/03/21 16:29:35 dawes 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
@@ -45,8 +45,13 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
4545
__glXNoSuchRenderOpcode,
4646
__glXNoSuchRenderOpcode,
4747
__glXNoSuchRenderOpcode,
48+
#ifndef MISSING_GL_EXTS
4849
__glXDisp_PointParameterfARB, /* 2065 */
4950
__glXDisp_PointParameterfvARB, /* 2066 */
51+
#else
52+
__glXNoSuchRenderOpcode,
53+
__glXNoSuchRenderOpcode,
54+
#endif
5055
__glXNoSuchRenderOpcode,
5156
__glXNoSuchRenderOpcode,
5257
__glXNoSuchRenderOpcode,
@@ -2104,6 +2109,7 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
21042109
__glXDisp_CopyTexSubImage1D, /* 4121 */
21052110
__glXDisp_CopyTexSubImage2D, /* 4122 */
21062111
__glXDisp_CopyTexSubImage3D, /* 4123 */
2112+
#ifndef MISSING_GL_EXTS
21072113
__glXDisp_FogCoordfv, /* 4124 */
21082114
__glXDisp_FogCoorddv, /* 4125 */
21092115
__glXDisp_SecondaryColor3bv, /* 4126 */
@@ -2115,6 +2121,19 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
21152121
__glXDisp_SecondaryColor3usv, /* 4132 */
21162122
__glXDisp_SecondaryColor3uiv, /* 4133 */
21172123
__glXDisp_BlendFuncSeparate, /* 4134 */
2124+
#else
2125+
__glXNoSuchRenderOpcode, /* 4124 */
2126+
__glXNoSuchRenderOpcode, /* 4125 */
2127+
__glXNoSuchRenderOpcode, /* 4126 */
2128+
__glXNoSuchRenderOpcode, /* 4127 */
2129+
__glXNoSuchRenderOpcode, /* 4128 */
2130+
__glXNoSuchRenderOpcode, /* 4129 */
2131+
__glXNoSuchRenderOpcode, /* 4130 */
2132+
__glXNoSuchRenderOpcode, /* 4131 */
2133+
__glXNoSuchRenderOpcode, /* 4132 */
2134+
__glXNoSuchRenderOpcode, /* 4133 */
2135+
__glXNoSuchRenderOpcode, /* 4134 */
2136+
#endif
21182137
__glXNoSuchRenderOpcode, /* 4135 */
21192138
__glXNoSuchRenderOpcode, /* 4136 */
21202139
__glXNoSuchRenderOpcode, /* 4137 */
@@ -2200,9 +2219,20 @@ __GLXdispatchRenderProcPtr __glXRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT - __
22002219
__glXNoSuchRenderOpcode,
22012220
__glXNoSuchRenderOpcode,
22022221
__glXNoSuchRenderOpcode, /* 4219 */
2222+
#ifndef MISSING_GL_EXTS
22032223
__glXDisp_ActiveStencilFaceEXT, /* 4220 */
2224+
# ifndef __DARWIN__
22042225
__glXDisp_PointParameteri, /* 4221 */
22052226
__glXDisp_PointParameteriv, /* 4222 */
2227+
# else
2228+
__glXDisp_PointParameteriNV, /* 4221 */
2229+
__glXDisp_PointParameterivNV, /* 4222 */
2230+
# endif
2231+
#else
2232+
__glXNoSuchRenderOpcode,
2233+
__glXNoSuchRenderOpcode,
2234+
__glXNoSuchRenderOpcode,
2235+
#endif
22062236
};
22072237
__GLXdispatchVendorPrivProcPtr __glXVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = {
22082238
__glXDisp_AreTexturesResidentEXT, /* 11 */
@@ -2225,8 +2255,13 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
22252255
__glXNoSuchRenderOpcode,
22262256
__glXNoSuchRenderOpcode,
22272257
__glXNoSuchRenderOpcode,
2258+
#ifndef MISSING_GL_EXTS
22282259
__glXDispSwap_PointParameterfARB, /* 2065 */
22292260
__glXDispSwap_PointParameterfvARB, /* 2066 */
2261+
#else
2262+
__glXNoSuchRenderOpcode,
2263+
__glXNoSuchRenderOpcode,
2264+
#endif
22302265
__glXNoSuchRenderOpcode,
22312266
__glXNoSuchRenderOpcode,
22322267
__glXNoSuchRenderOpcode,
@@ -4284,6 +4319,7 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
42844319
__glXDispSwap_CopyTexSubImage1D, /* 4121 */
42854320
__glXDispSwap_CopyTexSubImage2D, /* 4122 */
42864321
__glXDispSwap_CopyTexSubImage3D, /* 4123 */
4322+
#ifndef MISSING_GL_EXTS
42874323
__glXDispSwap_FogCoordfv, /* 4124 */
42884324
__glXDispSwap_FogCoorddv, /* 4125 */
42894325
__glXDispSwap_SecondaryColor3bv, /* 4126 */
@@ -4295,6 +4331,19 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
42954331
__glXDispSwap_SecondaryColor3usv, /* 4132 */
42964332
__glXDispSwap_SecondaryColor3uiv, /* 4133 */
42974333
__glXDisp_BlendFuncSeparate, /* 4134 */
4334+
#else
4335+
__glXNoSuchRenderOpcode, /* 4124 */
4336+
__glXNoSuchRenderOpcode, /* 4125 */
4337+
__glXNoSuchRenderOpcode, /* 4126 */
4338+
__glXNoSuchRenderOpcode, /* 4127 */
4339+
__glXNoSuchRenderOpcode, /* 4128 */
4340+
__glXNoSuchRenderOpcode, /* 4129 */
4341+
__glXNoSuchRenderOpcode, /* 4130 */
4342+
__glXNoSuchRenderOpcode, /* 4131 */
4343+
__glXNoSuchRenderOpcode, /* 4132 */
4344+
__glXNoSuchRenderOpcode, /* 4133 */
4345+
__glXNoSuchRenderOpcode, /* 4134 */
4346+
#endif
42984347
__glXNoSuchRenderOpcode, /* 4135 */
42994348
__glXNoSuchRenderOpcode, /* 4136 */
43004349
__glXNoSuchRenderOpcode, /* 4137 */
@@ -4380,9 +4429,20 @@ __GLXdispatchRenderProcPtr __glXSwapRenderTable_EXT[__GLX_MAX_RENDER_OPCODE_EXT
43804429
__glXNoSuchRenderOpcode,
43814430
__glXNoSuchRenderOpcode,
43824431
__glXNoSuchRenderOpcode, /* 4219 */
4432+
#ifndef MISSING_GL_EXTS
43834433
__glXDispSwap_ActiveStencilFaceEXT, /* 4220 */
4434+
# ifndef __DARWIN__
43844435
__glXDispSwap_PointParameteri, /* 4221 */
43854436
__glXDispSwap_PointParameteriv, /* 4222 */
4437+
# else
4438+
__glXDispSwap_PointParameteriNV, /* 4221 */
4439+
__glXDispSwap_PointParameterivNV, /* 4222 */
4440+
# endif
4441+
#else
4442+
__glXNoSuchRenderOpcode,
4443+
__glXNoSuchRenderOpcode,
4444+
__glXNoSuchRenderOpcode,
4445+
#endif
43864446
};
43874447
__GLXdispatchVendorPrivProcPtr __glXSwapVendorPrivTable_EXT[__GLX_MAX_VENDPRIV_OPCODE_EXT - __GLX_MIN_VENDPRIV_OPCODE_EXT + 1] = {
43884448
__glXDispSwap_AreTexturesResidentEXT, /* 11 */

‎GL/glx/g_disptab_EXT.h

+8-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.3 2001/03/21 16:29:35 dawes 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_
@@ -95,10 +95,17 @@ extern void __glXDispSwap_SecondaryColor3dv(GLbyte *);
9595
extern void __glXDisp_BlendFuncSeparate(GLbyte *);
9696
extern void __glXDispSwap_BlendFuncSeparate(GLbyte *);
9797

98+
#ifdef __DARWIN__
99+
extern void __glXDisp_PointParameteriNV(GLbyte *);
100+
extern void __glXDisp_PointParameterivNV(GLbyte *);
101+
extern void __glXDispSwap_PointParameteriNV(GLbyte *);
102+
extern void __glXDispSwap_PointParameterivNV(GLbyte *);
103+
#else
98104
extern void __glXDisp_PointParameteri(GLbyte *);
99105
extern void __glXDisp_PointParameteriv(GLbyte *);
100106
extern void __glXDispSwap_PointParameteri(GLbyte *);
101107
extern void __glXDispSwap_PointParameteriv(GLbyte *);
108+
#endif
102109

103110
extern void __glXDisp_ActiveStencilFaceEXT(GLbyte*);
104111

‎GL/glx/g_single.c

+1-5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/g_single.c,v 1.5tsi Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free
@@ -1264,7 +1264,6 @@ int __glXDisp_AreTexturesResident(__GLXclientState *cl, GLbyte *pc)
12641264

12651265
int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
12661266
{
1267-
GLsizei n;
12681267
__GLXcontext *cx;
12691268
int error;
12701269

@@ -1273,7 +1272,6 @@ int __glXDisp_DeleteTextures(__GLXclientState *cl, GLbyte *pc)
12731272
return error;
12741273
}
12751274
pc += __GLX_SINGLE_HDR_SIZE;
1276-
n = *(GLsizei *)(pc + 0);
12771275

12781276
glDeleteTextures(
12791277
*(GLsizei *)(pc + 0),
@@ -1717,7 +1715,6 @@ int __glXDisp_AreTexturesResidentEXT(__GLXclientState *cl, GLbyte *pc)
17171715

17181716
int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
17191717
{
1720-
GLsizei n;
17211718
__GLXcontext *cx;
17221719
int error;
17231720

@@ -1726,7 +1723,6 @@ int __glXDisp_DeleteTexturesEXT(__GLXclientState *cl, GLbyte *pc)
17261723
return error;
17271724
}
17281725
pc += __GLX_VENDPRIV_HDR_SIZE;
1729-
n = *(GLsizei *)(pc + 0);
17301726

17311727
glDeleteTexturesEXT(
17321728
*(GLsizei *)(pc + 0),

‎GL/glx/g_singleswap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.5 2002/01/14 22:47:08 tsi Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/g_singleswap.c,v 1.4tsi Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/global.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/global.c,v 1.3 2001/03/21 16:29:35 dawes Exp $ */
1+
/* $XFree86$ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/glxbuf.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.7 2001/10/31 22:50:26 tsi Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.c,v 1.6 2001/03/25 05:32:01 tsi Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/glxbuf.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxbuf.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86$ */
22
#ifndef _glxbuf_h_
33
#define _glxbuf_h_
44

‎GL/glx/glxerror.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxerror.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86$ */
22
#ifndef _GLX_error_h_
33
#define _GLX_error_h_
44

‎GL/glx/glxfb.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.c,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86$ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/glxfb.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxfb.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86$ */
22
#ifndef _glxfb_h_
33
#define _glxfb_h_
44

‎GL/glx/glxmem.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.7 2002/08/28 06:41:26 torrey Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/glxmem.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxmem.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86$ */
22
#ifndef _glxmem_h_
33
#define _glxmem_h_
44

‎GL/glx/glxpix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.4 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.c,v 1.3 2000/09/26 15:57:02 tsi Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/glxpix.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/glxpix.h,v 1.3 2001/03/21 16:29:36 dawes Exp $ */
1+
/* $XFree86$ */
22
#ifndef _glxpix_h_
33
#define _glxpix_h_
44

‎GL/glx/impsize.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/impsize.h,v 1.4 2003/09/28 20:15:43 alanh Exp $ */
22
#ifndef _impsize_h_
33
#define _impsize_h_
44

‎GL/glx/renderpix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/renderpix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86$ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/renderpixswap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/renderpixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86$ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/rensizetab.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/rensizetab.c,v 1.5 2004/01/28 18:11:53 alanh Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/singlepix.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/singlepix.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86$ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/singlepixswap.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.6 2001/10/31 22:50:27 tsi Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/singlepixswap.c,v 1.5 2001/03/21 16:29:37 dawes Exp $ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/glx/singlesize.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/singlesize.h,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86$ */
22
#ifndef _singlesize_h_
33
#define _singlesize_h_
44

‎GL/glx/unpack.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.5 2002/10/30 12:52:03 alanh Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/glx/unpack.h,v 1.4 2002/01/14 22:47:08 tsi Exp $ */
22
#ifndef __GLX_unpack_h__
33
#define __GLX_unpack_h__
44

‎GL/glx/xfont.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/glx/xfont.c,v 1.3 2001/03/21 16:29:37 dawes Exp $ */
1+
/* $XFree86$ */
22
/*
33
** License Applicability. Except to the extent portions of this file are
44
** made subject to an alternative license as permitted in the SGI Free

‎GL/include/GL/glx_ansic.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#ifndef _glx_ansic_h_
22
#define _glx_ansic_h_
33

4-
/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.7 2002/04/04 14:05:36 eich Exp $ */
4+
/* $XFree86: xc/programs/Xserver/GL/include/GL/glx_ansic.h,v 1.5 2001/03/21 20:49:08 dawes Exp $ */
55
/*
66
** License Applicability. Except to the extent portions of this file are
77
** made subject to an alternative license as permitted in the SGI Free

‎GL/include/GL/xf86glx.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.4 2000/02/23 04:46:54 martin Exp $ */
1+
/* $XFree86: xc/programs/Xserver/GL/include/GL/xf86glx.h,v 1.3 1999/06/14 07:31:41 dawes Exp $ */
22
/**************************************************************************
33
44
Copyright 1998-1999 Precision Insight, Inc., Cedar Park, Texas.

0 commit comments

Comments
 (0)