SOURCES: glide-gcc4.patch (NEW), glide-no_redefine_macro.patch (NE...

sls sls at pld-linux.org
Wed Jan 3 18:23:19 CET 2007


Author: sls                          Date: Wed Jan  3 17:23:19 2007 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- added buildfixes

---- Files affected:
SOURCES:
   glide-gcc4.patch (NONE -> 1.1)  (NEW), glide-no_redefine_macro.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: SOURCES/glide-gcc4.patch
diff -u /dev/null SOURCES/glide-gcc4.patch:1.1
--- /dev/null	Wed Jan  3 18:23:19 2007
+++ SOURCES/glide-gcc4.patch	Wed Jan  3 18:23:14 2007
@@ -0,0 +1,172 @@
+--- glide3x-20010309-orig/h3/glide3/src/gaa.c	2006-06-03 00:42:40.000000000 +0000
++++ glide3x-20010309/h3/glide3/src/gaa.c	2006-06-03 00:47:11.000000000 +0000
+@@ -614,7 +614,7 @@
+       e = pointers;
+       if (mode)
+         e = *(float **)e;
+-      (float *)pointers += stride;
++      pointers = (float *)pointers + stride;
+       
+       ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
+       ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
+@@ -715,7 +715,7 @@
+       if (mode)
+         e = *(float **)e;
+       oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);        
+-      (float *)pointers += stride;
++      pointers = (float *)pointers + stride;
+       
+       ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
+         *oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
+@@ -837,9 +837,9 @@
+         v1 = *(float **)v1;
+         v2 = *(float **)v2;
+       }
+-      (float *)pointers += stride;
++      pointers = (float *)pointers + stride;
+       if (ltype == GR_LINES)
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+       
+       /* draw from low Y to high Y */
+       if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) {
+@@ -1018,9 +1018,9 @@
+           v1 = *(float **)v1;
+           v2 = *(float **)v2;
+         }
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         if (ltype == GR_LINES)
+-          (float *)pointers += stride;
++          pointers = (float *)pointers + stride;
+         owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset);
+         owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
+       }
+@@ -1032,7 +1032,7 @@
+           v1 = *(float **)v1;
+           v2 = *(float **)v2;
+         }
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
+       }
+       
+@@ -1366,7 +1366,7 @@
+       b = *(float **)b;
+       c = *(float **)c;
+     }
+-    (float *)pointers += stride*3;
++    pointers = (float *)pointers + stride * 3;
+ 
+     /* move culling test to here */
+     {
+@@ -1540,7 +1540,7 @@
+       b = *(float **)b;
+       c = *(float **)c;
+     }
+-    (float *)pointers += stride*3;
++    pointers = (float *)pointers + stride * 3;
+     oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);        
+     oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);        
+     oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset);        
+@@ -1705,7 +1705,7 @@
+   if (type == kSetupFan) {
+     v[0] = (mode == 0) ? pointers : *(float **)pointers;
+     while (sCount--) {
+-      (float *)pointers += stride;
++      pointers = (float *)pointers + stride;
+       if (mode) {
+         v[1] = *(float **)pointers;
+         v[2] = *((float **)pointers+1);
+@@ -1747,7 +1747,7 @@
+         _grAADrawTriangles(1, type, 3, v);
+       else
+         _grAAVpDrawTriangles(1, type, 3, v);    
+-      (float *)pointers += stride;
++      pointers = (float *)pointers + stride;
+       flip = ~flip;
+     }
+     flip = ~flip;
+--- glide3x-20010309-orig/h3/glide3/src/gdraw.c	2006-06-03 00:42:40.000000000 +0000
++++ glide3x-20010309/h3/glide3/src/gdraw.c	2006-06-03 04:30:48.000000000 +0000
+@@ -403,7 +403,7 @@
+         vPtr = pointers;
+         if (mode) vPtr = *(float **)vPtr;
+         
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         
+         GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",  
+                        FARRAY(vPtr,gc->state.vData.vertexInfo.offset), 
+@@ -492,7 +492,7 @@
+         if (mode)
+           vPtr = *(float **)vPtr;
+         oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);        
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         
+         {
+           FxU32 x, y;
+@@ -617,9 +617,9 @@
+           a = *(float **)a;
+           b = *(float **)b;
+         }
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         if (ltype == GR_LINES)
+-          (float *)pointers += stride;
++          pointers = (float *)pointers + stride;
+         
+         /*
+         ** compute absolute deltas and draw from low Y to high Y
+@@ -779,10 +779,10 @@
+             a = *(float **)a;
+             b = *(float **)b;
+           }
+-          (float *)pointers += stride;
++          pointers = (float *)pointers + stride;
+           owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);        
+           owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);        
+-          (float *)pointers += stride;
++          pointers = (float *)pointers + stride;
+         }
+         else {
+           owa = oowa = oowb;
+@@ -792,7 +792,7 @@
+             a = *(float **)a;
+             b = *(float **)b;
+           }
+-          (float *)pointers += stride;
++          pointers = (float *)pointers + stride;
+           owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
+         }
+         fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
+@@ -944,7 +944,7 @@
+         vPtr = pointers;
+         if (mode)
+           vPtr = *(float **)vPtr;
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         
+         i = gc->tsuDataList[dataElem];
+         
+@@ -984,7 +984,7 @@
+                  *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
+         TRI_SETF(FARRAY(vPtr, 4)
+                  *oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
+-        (float *)pointers += stride;
++        pointers = (float *)pointers + stride;
+         
+         TRI_VP_SETFS(vPtr,oow);
+       }
+--- glide3x-20010309-orig/h3/glide3/src/distrip.c	2006-06-03 00:42:40.000000000 +0000
++++ glide3x-20010309/h3/glide3/src/distrip.c	2006-06-03 06:33:03.000000000 +0000
+@@ -450,7 +450,7 @@
+     else {
+       while ((int)Count >= 3) {
+         grDrawTriangle(*(float **)pointers, *((float **)pointers+1), *((float **)pointers+2));
+-        (float *)pointers += 3;
++        pointers = (float *)pointers + 3;
+         Count -= 3;
+       }
+     }

================================================================
Index: SOURCES/glide-no_redefine_macro.patch
diff -u /dev/null SOURCES/glide-no_redefine_macro.patch:1.1
--- /dev/null	Wed Jan  3 18:23:19 2007
+++ SOURCES/glide-no_redefine_macro.patch	Wed Jan  3 18:23:14 2007
@@ -0,0 +1,33 @@
+--- glide3x-20010309-orig/h3/glide3/src/xdraw2.inc.S	2006-06-03 00:42:40.000000000 +0000
++++ glide3x-20010309/h3/glide3/src/xdraw2.inc.S	2006-06-03 13:09:54.000000000 +0000
+@@ -55,7 +55,8 @@
+ 
+ .file "xdraw2.inc.S"
+ 
+-
++#ifndef XDRAW2_INC_MACROS_0
++#define XDRAW2_INC_MACROS_0
+ .macro GR_FIFO_WRITE __addr __offset __data
+ 	mov \__data , \__offset(\__addr)
+ .endm	/*  GR_FIFO_WRITE */
+@@ -69,6 +70,7 @@
+ .macro WRITE_MM1LOW_FIFO 
+ 	movd %mm1 , (%ebp)	/*  store current param | previous param */
+ .endm	/*  WRITE_MM1LOW_FIFO */
++#endif
+ 
+ 
+ #if 0
+@@ -812,9 +814,12 @@
+ #define packCol %edi
+ #define tempVal %edi
+ 
++#ifndef XDRAW2_INC_MACROS_1
++#define XDRAW2_INC_MACROS_1
+ .macro GR_FIFO_WRITE __addr __offset __data
+ 	mov \__data , \__offset(\__addr)
+ .endm	/*  GR_FIFO_WRITE */
++#endif
+ 
+ .align 4
+ LOCAL(__triBegin):
================================================================


More information about the pld-cvs-commit mailing list