devel/Glide3-libGL/Mesa-6.2.1-64bit.patch

--- Mesa-6.2.1/include/GL/fxmesa.h.64bit	2004-02-10 08:46:07.000000000 +0100
+++ Mesa-6.2.1/include/GL/fxmesa.h	2006-01-15 09:48:06.000000000 +0100
@@ -66,11 +66,11 @@
 
 GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
 						  GrScreenRefresh_t,
-						  const GLint attribList[]);
+						  const long attribList[]);
 
 GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
 						      GLint width, GLint height,
-						      const GLint attribList[]);
+						      const long attribList[]);
 GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
 
 GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
--- Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c.64bit	2006-01-15 10:53:41.000000000 +0100
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c	2006-01-15 10:53:44.000000000 +0100
@@ -239,7 +239,7 @@
    tfxTexInfo *ti;
 
    if (TDFX_DEBUG & VERBOSE_DRIVER) {
-      fprintf(stderr, "fxDDTexBind(%d, %x)\n", tObj->Name, (GLuint)tObj->DriverData);
+      fprintf(stderr, "fxDDTexBind(%d, %lx)\n", tObj->Name, (unsigned long)tObj->DriverData);
    }
 
    if ((target != GL_TEXTURE_1D) && (target != GL_TEXTURE_2D))
@@ -295,8 +295,8 @@
    tfxTexInfo *ti;
 
    if (TDFX_DEBUG & VERBOSE_DRIVER) {
-      fprintf(stderr, "fxDDTexParam(%d, %x, %s, %s)\n",
-                      tObj->Name, (GLuint) tObj->DriverData,
+      fprintf(stderr, "fxDDTexParam(%d, %lx, %s, %s)\n",
+                      tObj->Name, (unsigned long) tObj->DriverData,
                       _mesa_lookup_enum_by_nr(pname),
                       _mesa_lookup_enum_by_nr(param));
    }
@@ -581,8 +581,8 @@
       /* per-texture palette */
       tfxTexInfo *ti;
       if (TDFX_DEBUG & VERBOSE_DRIVER) {
-	 fprintf(stderr, "fxDDTexPalette(%d, %x)\n",
-		 tObj->Name, (GLuint) tObj->DriverData);
+	 fprintf(stderr, "fxDDTexPalette(%d, %lx)\n",
+		 tObj->Name, (unsigned long) tObj->DriverData);
       }
       /* This might be a proxy texture. */
       if (!tObj->Palette.Table)
@@ -1801,7 +1801,7 @@
    for (i = 0; i < rows; i++) {
       MEMCPY(dest, data, srcRowStride);
       dest += destRowStride;
-      data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
+      data = (GLvoid *)((GLubyte*)data + srcRowStride);
    }
 
    /* [dBorca] Hack alert:
--- Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c.64bit	2004-09-24 16:31:55.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c	2006-01-15 09:48:06.000000000 +0100
@@ -267,7 +267,7 @@
 
 fxMesaContext GLAPIENTRY
 fxMesaCreateBestContext(GLuint win, GLint width, GLint height,
-			const GLint attribList[])
+			const long attribList[])
 {
  int res = fxBestResolution(width, height);
 
@@ -285,7 +285,7 @@
 fxMesaContext GLAPIENTRY
 fxMesaCreateContext(GLuint win,
 		    GrScreenResolution_t res,
-		    GrScreenRefresh_t ref, const GLint attribList[])
+		    GrScreenRefresh_t ref, const long attribList[])
 {
  fxMesaContext fxMesa = NULL;
  GLcontext *ctx = NULL, *shareCtx = NULL;
--- Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c.64bit	2004-04-30 11:44:22.000000000 +0200
+++ Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c	2006-01-15 09:48:06.000000000 +0100
@@ -1809,7 +1809,7 @@
    fxEnvVar = _mesa_getenv("MESA_GLX_FX");
    if (fxEnvVar) {
      if (fxEnvVar[0]!='d') {
-       int attribs[100];
+       long attribs[100];
        int numAttribs = 0;
        int hw;
        if (v->mesa_visual.depthBits > 0) {
@@ -1833,7 +1833,7 @@
        }
        if (1) {
          attribs[numAttribs++] = FXMESA_SHARE_CONTEXT;
-         attribs[numAttribs++] = (int) &(c->mesa);
+         attribs[numAttribs++] = (long) &(c->mesa);
        }
        attribs[numAttribs++] = FXMESA_NONE;
 
--- Mesa-6.2.1/src/mesa/main/texstore.c.64bit	2004-08-25 17:59:49.000000000 +0200
+++ Mesa-6.2.1/src/mesa/main/texstore.c	2006-01-15 09:48:06.000000000 +0100
@@ -1830,7 +1830,7 @@
    else {
       /* using a PBO */
       if ((const GLubyte *) pixels + imageSize >
-          (const GLubyte *) packing->BufferObj->Size) {
+          (const GLubyte *)(unsigned long) packing->BufferObj->Size) {
          /* out of bounds read! */
          return NULL;
       }
--- Mesa-6.2.1/src/mesa/main/bufferobj.c.64bit	2004-11-22 21:05:42.000000000 +0100
+++ Mesa-6.2.1/src/mesa/main/bufferobj.c	2006-01-15 09:48:06.000000000 +0100
@@ -412,11 +412,11 @@
                               format, type, depth-1, height-1, width);
 
 
-   if ((const GLubyte *) start > (const GLubyte *) pack->BufferObj->Size) {
+   if ((const GLubyte *) start > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
       /* This will catch negative values / wrap-around */
       return GL_FALSE;
    }
-   if ((const GLubyte *) end > (const GLubyte *) pack->BufferObj->Size) {
+   if ((const GLubyte *) end > (const GLubyte *)(unsigned long) pack->BufferObj->Size) {
       /* Image read goes beyond end of buffer */
       return GL_FALSE;
    }
--- Mesa-6.2.1/src/mesa/glapi/glapi.h.64bit	2004-12-08 16:07:30.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.h	2006-01-15 09:48:06.000000000 +0100
@@ -117,7 +117,7 @@
 _glapi_get_proc_offset(const char *funcName);
 
 
-extern const _glapi_proc
+extern _glapi_proc
 _glapi_get_proc_address(const char *funcName);
 
 
--- Mesa-6.2.1/src/mesa/glapi/glapi.c.64bit	2004-12-05 18:26:27.000000000 +0100
+++ Mesa-6.2.1/src/mesa/glapi/glapi.c	2006-01-15 09:48:06.000000000 +0100
@@ -532,7 +532,7 @@
  * Return pointer to the named static (built-in) function.
  * \return  NULL if function not found.
  */
-static const _glapi_proc
+static _glapi_proc
 get_static_proc_address(const char *funcName)
 {
    const glprocs_table_t * const f = find_entry( funcName );
@@ -837,7 +837,7 @@
  * in the name of static functions, try generating a new API entrypoint on
  * the fly with assembly language.
  */
-const _glapi_proc
+_glapi_proc
 _glapi_get_proc_address(const char *funcName)
 {
    GLuint i;
1	--- Mesa-6.2.1/include/GL/fxmesa.h.64bit 2004-02-10 08:46:07.000000000 +0100
2	+++ Mesa-6.2.1/include/GL/fxmesa.h 2006-01-15 09:48:06.000000000 +0100
3	@@ -66,11 +66,11 @@
4
5	GLAPI fxMesaContext GLAPIENTRY fxMesaCreateContext(GLuint win, GrScreenResolution_t,
6	GrScreenRefresh_t,
7	- const GLint attribList[]);
8	+ const long attribList[]);
9
10	GLAPI fxMesaContext GLAPIENTRY fxMesaCreateBestContext(GLuint win,
11	GLint width, GLint height,
12	- const GLint attribList[]);
13	+ const long attribList[]);
14	GLAPI void GLAPIENTRY fxMesaDestroyContext(fxMesaContext ctx);
15
16	GLAPI GLint GLAPIENTRY fxMesaSelectCurrentBoard(int n);
17	--- Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c.64bit 2006-01-15 10:53:41.000000000 +0100
18	+++ Mesa-6.2.1/src/mesa/drivers/glide/fxddtex.c 2006-01-15 10:53:44.000000000 +0100
19	@@ -239,7 +239,7 @@
20	tfxTexInfo *ti;
21
22	if (TDFX_DEBUG & VERBOSE_DRIVER) {
23	- fprintf(stderr, "fxDDTexBind(%d, %x)\n", tObj->Name, (GLuint)tObj->DriverData);
24	+ fprintf(stderr, "fxDDTexBind(%d, %lx)\n", tObj->Name, (unsigned long)tObj->DriverData);
25	}
26
27	if ((target != GL_TEXTURE_1D) && (target != GL_TEXTURE_2D))
28	@@ -295,8 +295,8 @@
29	tfxTexInfo *ti;
30
31	if (TDFX_DEBUG & VERBOSE_DRIVER) {
32	- fprintf(stderr, "fxDDTexParam(%d, %x, %s, %s)\n",
33	- tObj->Name, (GLuint) tObj->DriverData,
34	+ fprintf(stderr, "fxDDTexParam(%d, %lx, %s, %s)\n",
35	+ tObj->Name, (unsigned long) tObj->DriverData,
36	_mesa_lookup_enum_by_nr(pname),
37	_mesa_lookup_enum_by_nr(param));
38	}
39	@@ -581,8 +581,8 @@
40	/* per-texture palette */
41	tfxTexInfo *ti;
42	if (TDFX_DEBUG & VERBOSE_DRIVER) {
43	- fprintf(stderr, "fxDDTexPalette(%d, %x)\n",
44	- tObj->Name, (GLuint) tObj->DriverData);
45	+ fprintf(stderr, "fxDDTexPalette(%d, %lx)\n",
46	+ tObj->Name, (unsigned long) tObj->DriverData);
47	}
48	/* This might be a proxy texture. */
49	if (!tObj->Palette.Table)
50	@@ -1801,7 +1801,7 @@
51	for (i = 0; i < rows; i++) {
52	MEMCPY(dest, data, srcRowStride);
53	dest += destRowStride;
54	- data = (GLvoid *)((GLuint)data + (GLuint)srcRowStride);
55	+ data = (GLvoid )((GLubyte)data + srcRowStride);
56	}
57
58	/* [dBorca] Hack alert:
59	--- Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c.64bit 2004-09-24 16:31:55.000000000 +0200
60	+++ Mesa-6.2.1/src/mesa/drivers/glide/fxapi.c 2006-01-15 09:48:06.000000000 +0100
61	@@ -267,7 +267,7 @@
62
63	fxMesaContext GLAPIENTRY
64	fxMesaCreateBestContext(GLuint win, GLint width, GLint height,
65	- const GLint attribList[])
66	+ const long attribList[])
67	{
68	int res = fxBestResolution(width, height);
69
70	@@ -285,7 +285,7 @@
71	fxMesaContext GLAPIENTRY
72	fxMesaCreateContext(GLuint win,
73	GrScreenResolution_t res,
74	- GrScreenRefresh_t ref, const GLint attribList[])
75	+ GrScreenRefresh_t ref, const long attribList[])
76	{
77	fxMesaContext fxMesa = NULL;
78	GLcontext ctx = NULL, shareCtx = NULL;
79	--- Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c.64bit 2004-04-30 11:44:22.000000000 +0200
80	+++ Mesa-6.2.1/src/mesa/drivers/x11/xm_api.c 2006-01-15 09:48:06.000000000 +0100
81	@@ -1809,7 +1809,7 @@
82	fxEnvVar = _mesa_getenv("MESA_GLX_FX");
83	if (fxEnvVar) {
84	if (fxEnvVar[0]!='d') {
85	- int attribs[100];
86	+ long attribs[100];
87	int numAttribs = 0;
88	int hw;
89	if (v->mesa_visual.depthBits > 0) {
90	@@ -1833,7 +1833,7 @@
91	}
92	if (1) {
93	attribs[numAttribs++] = FXMESA_SHARE_CONTEXT;
94	- attribs[numAttribs++] = (int) &(c->mesa);
95	+ attribs[numAttribs++] = (long) &(c->mesa);
96	}
97	attribs[numAttribs++] = FXMESA_NONE;
98
99	--- Mesa-6.2.1/src/mesa/main/texstore.c.64bit 2004-08-25 17:59:49.000000000 +0200
100	+++ Mesa-6.2.1/src/mesa/main/texstore.c 2006-01-15 09:48:06.000000000 +0100
101	@@ -1830,7 +1830,7 @@
102	else {
103	/* using a PBO */
104	if ((const GLubyte *) pixels + imageSize >
105	- (const GLubyte *) packing->BufferObj->Size) {
106	+ (const GLubyte *)(unsigned long) packing->BufferObj->Size) {
107	/* out of bounds read! */
108	return NULL;
109	}
110	--- Mesa-6.2.1/src/mesa/main/bufferobj.c.64bit 2004-11-22 21:05:42.000000000 +0100
111	+++ Mesa-6.2.1/src/mesa/main/bufferobj.c 2006-01-15 09:48:06.000000000 +0100
112	@@ -412,11 +412,11 @@
113	format, type, depth-1, height-1, width);
114
115
116	- if ((const GLubyte ) start > (const GLubyte ) pack->BufferObj->Size) {
117	+ if ((const GLubyte ) start > (const GLubyte )(unsigned long) pack->BufferObj->Size) {
118	/* This will catch negative values / wrap-around */
119	return GL_FALSE;
120	}
121	- if ((const GLubyte ) end > (const GLubyte ) pack->BufferObj->Size) {
122	+ if ((const GLubyte ) end > (const GLubyte )(unsigned long) pack->BufferObj->Size) {
123	/* Image read goes beyond end of buffer */
124	return GL_FALSE;
125	}
126	--- Mesa-6.2.1/src/mesa/glapi/glapi.h.64bit 2004-12-08 16:07:30.000000000 +0100
127	+++ Mesa-6.2.1/src/mesa/glapi/glapi.h 2006-01-15 09:48:06.000000000 +0100
128	@@ -117,7 +117,7 @@
129	_glapi_get_proc_offset(const char *funcName);
130
131
132	-extern const _glapi_proc
133	+extern _glapi_proc
134	_glapi_get_proc_address(const char *funcName);
135
136
137	--- Mesa-6.2.1/src/mesa/glapi/glapi.c.64bit 2004-12-05 18:26:27.000000000 +0100
138	+++ Mesa-6.2.1/src/mesa/glapi/glapi.c 2006-01-15 09:48:06.000000000 +0100
139	@@ -532,7 +532,7 @@
140	* Return pointer to the named static (built-in) function.
141	* \return NULL if function not found.
142	*/
143	-static const _glapi_proc
144	+static _glapi_proc
145	get_static_proc_address(const char *funcName)
146	{
147	const glprocs_table_t * const f = find_entry( funcName );
148	@@ -837,7 +837,7 @@
149	* in the name of static functions, try generating a new API entrypoint on
150	* the fly with assembly language.
151	*/
152	-const _glapi_proc
153	+_glapi_proc
154	_glapi_get_proc_address(const char *funcName)
155	{
156	GLuint i;
admin@fedoraproject.org	ViewVC Help
Powered by ViewVC 1.1.2