1 --- GlideV3.orig/glide2x/cvg/glide/tests/display.c
2 +++ GlideV3/glide2x/cvg/glide/tests/display.c
3 @@ -65,6 +65,10 @@ static const char *sourceFormatString[]
7 +static void imageConvert( void *dst,
9 + GrLfbSrcFmt_t format,
12 int main( int argc, char **argv)
14 @@ -91,11 +95,6 @@ int main( int argc, char **argv)
15 static FxU32 imageWidth;
16 static FxU32 imageHeight;
18 - static void imageConvert( void *dst,
20 - GrLfbSrcFmt_t format,
26 --- GlideV3.orig/glide2x/cvg/glide/tests/test26.c
27 +++ GlideV3/glide2x/cvg/glide/tests/test26.c
28 @@ -57,6 +57,10 @@ static const char *sourceFormatString[]
29 "GR_LFB_SRC_FMT_ZA16 "
32 +static void imageConvert( void *dst,
34 + GrLfbSrcFmt_t format,
37 int main( int argc, char **argv) {
39 @@ -80,11 +84,6 @@ int main( int argc, char **argv) {
40 static FxU32 imageWidth;
41 static FxU32 imageHeight;
43 - static void imageConvert( void *dst,
45 - GrLfbSrcFmt_t format,
48 /* Process Command Line Arguments */
49 while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
51 --- GlideV3.orig/glide2x/h3/glide/src/xdraw2.inc.S
52 +++ GlideV3/glide2x/h3/glide/src/xdraw2.inc.S
59 +#ifndef GR_FIFO_WRITE_MACRO
60 +#define GR_FIFO_WRITE_MACRO
61 .MACRO GR_FIFO_WRITE __addr __offset __data
62 mov \__data , \__offset(\__addr)
63 .ENDM /* GR_FIFO_WRITE */
69 +#ifndef MM1_FIFO_MACROS
70 +#define MM1_FIFO_MACROS
71 .MACRO WRITE_MM1_FIFO_ALIGNED
72 movq %mm1 , (%ebp) /* store current param | previous param */
73 .ENDM /* WRITE_MM1_FIFO_ALIGNED */
75 .MACRO WRITE_MM1LOW_FIFO
76 movd %mm1 , (%ebp) /* store current param | previous param */
77 .ENDM /* WRITE_MM1LOW_FIFO */
80 #define gc %edi /* points to graphics context */
81 #define fifo %ebp /* points to fifo entries */
82 @@ -1103,10 +1109,6 @@ LOCAL(Area_Computation):
86 -.MACRO GR_FIFO_WRITE __addr __offset __data
87 - mov \__data , \__offset(\__addr)
88 -.ENDM /* GR_FIFO_WRITE */
92 mov fifoPtr(gc) , fifo /* Fetch Fifo Ptr */
93 --- GlideV3.orig/glide2x/h3/glide/tests/display.c
94 +++ GlideV3/glide2x/h3/glide/tests/display.c
95 @@ -65,6 +65,10 @@ static const char *sourceFormatString[]
96 "GR_LFB_SRC_FMT_ZA16 "
99 +static void imageConvert( void *dst,
101 + GrLfbSrcFmt_t format,
104 int main( int argc, char **argv)
106 @@ -91,11 +95,6 @@ int main( int argc, char **argv)
107 static FxU32 imageWidth;
108 static FxU32 imageHeight;
110 - static void imageConvert( void *dst,
112 - GrLfbSrcFmt_t format,
118 --- GlideV3.orig/glide2x/h3/glide/tests/test26.c
119 +++ GlideV3/glide2x/h3/glide/tests/test26.c
120 @@ -57,6 +57,10 @@ static const char *sourceFormatString[]
121 "GR_LFB_SRC_FMT_ZA16 "
124 +static void imageConvert( void *dst,
126 + GrLfbSrcFmt_t format,
129 int main( int argc, char **argv) {
131 @@ -80,11 +84,6 @@ int main( int argc, char **argv) {
132 static FxU32 imageWidth;
133 static FxU32 imageHeight;
135 - static void imageConvert( void *dst,
137 - GrLfbSrcFmt_t format,
140 /* Process Command Line Arguments */
141 while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) {
143 --- GlideV3.orig/glide2x/sst1/glide/tests/display.c
144 +++ GlideV3/glide2x/sst1/glide/tests/display.c
145 @@ -70,6 +70,10 @@ static const char *sourceFormatString[]
146 "GR_LFB_SRC_FMT_ZA16 "
149 +static void imageConvert( void *dst,
151 + GrLfbSrcFmt_t format,
154 void main( int argc, char **argv) {
156 @@ -95,11 +99,6 @@ void main( int argc, char **argv) {
157 static FxU32 imageWidth;
158 static FxU32 imageHeight;
160 - static void imageConvert( void *dst,
162 - GrLfbSrcFmt_t format,
168 --- GlideV3.orig/glide2x/sst1/glide/tests/test26.c
169 +++ GlideV3/glide2x/sst1/glide/tests/test26.c
170 @@ -62,6 +62,10 @@ static const char *sourceFormatString[]
171 "GR_LFB_SRC_FMT_ZA16 "
174 +static void imageConvert( void *dst,
176 + GrLfbSrcFmt_t format,
179 void main( int argc, char **argv) {
181 @@ -85,11 +89,6 @@ void main( int argc, char **argv) {
182 static FxU32 imageWidth;
183 static FxU32 imageHeight;
185 - static void imageConvert( void *dst,
187 - GrLfbSrcFmt_t format,
190 /* Process Command Line Arguments */
191 while( rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs ) ) {
193 --- GlideV3.orig/glide3x/cvg/glide3/tests/display.c
194 +++ GlideV3/glide3x/cvg/glide3/tests/display.c
195 @@ -56,6 +56,10 @@ static const char *sourceFormatString[]
196 "GR_LFB_SRC_FMT_ZA16 "
199 +static void imageConvert( void *dst,
201 + GrLfbSrcFmt_t format,
204 void main( int argc, char **argv) {
206 @@ -81,11 +85,6 @@ void main( int argc, char **argv) {
207 static FxU32 imageWidth;
208 static FxU32 imageHeight;
210 - static void imageConvert( void *dst,
212 - GrLfbSrcFmt_t format,
218 --- GlideV3.orig/glide3x/cvg/glide3/tests/test26.c
219 +++ GlideV3/glide3x/cvg/glide3/tests/test26.c
220 @@ -48,6 +48,10 @@ static const char *sourceFormatString[]
221 "GR_LFB_SRC_FMT_ZA16 "
224 +static void imageConvert( void *dst,
226 + GrLfbSrcFmt_t format,
229 void main( int argc, char **argv) {
231 @@ -69,11 +73,6 @@ void main( int argc, char **argv) {
232 static FxU32 imageWidth;
233 static FxU32 imageHeight;
235 - static void imageConvert( void *dst,
237 - GrLfbSrcFmt_t format,
240 /* Initialize Glide */
242 assert( hwconfig = tlVoodooType() );
243 --- GlideV3.orig/glide3x/h3/glide3/tests/display.c
244 +++ GlideV3/glide3x/h3/glide3/tests/display.c
245 @@ -56,6 +56,10 @@ static const char *sourceFormatString[]
246 "GR_LFB_SRC_FMT_ZA16 "
249 +static void imageConvert( void *dst,
251 + GrLfbSrcFmt_t format,
254 void main( int argc, char **argv) {
256 @@ -81,11 +85,6 @@ void main( int argc, char **argv) {
257 static FxU32 imageWidth;
258 static FxU32 imageHeight;
260 - static void imageConvert( void *dst,
262 - GrLfbSrcFmt_t format,
268 --- GlideV3.orig/glide3x/h3/glide3/tests/test26.c
269 +++ GlideV3/glide3x/h3/glide3/tests/test26.c
270 @@ -48,6 +48,10 @@ static const char *sourceFormatString[]
271 "GR_LFB_SRC_FMT_ZA16 "
274 +static void imageConvert( void *dst,
276 + GrLfbSrcFmt_t format,
279 void main( int argc, char **argv) {
281 @@ -69,11 +73,6 @@ void main( int argc, char **argv) {
282 static FxU32 imageWidth;
283 static FxU32 imageHeight;
285 - static void imageConvert( void *dst,
287 - GrLfbSrcFmt_t format,
290 /* Initialize Glide */
292 assert( hwconfig = tlVoodooType() );
293 --- GlideV3.orig/glide3x/h3/glide3/src/xdraw2.inc.S
294 +++ GlideV3/glide3x/h3/glide3/src/xdraw2.inc.S
299 +#ifndef XDRAW2_FIFO_MACROS
300 +#define XDRAW2_FIFO_MACROS
301 .macro GR_FIFO_WRITE __addr __offset __data
302 mov \__data , \__offset(\__addr)
303 .endm /* GR_FIFO_WRITE */
305 .macro WRITE_MM1LOW_FIFO
306 movd %mm1 , (%ebp) /* store current param | previous param */
307 .endm /* WRITE_MM1LOW_FIFO */
312 @@ -815,9 +818,12 @@ LOCAL(nocull):
316 +#ifndef XDRAW2_FIFO_MACROS
317 +#define XDRAW2_FIFO_MACROS
318 .macro GR_FIFO_WRITE __addr __offset __data
319 mov \__data , \__offset(\__addr)
320 .endm /* GR_FIFO_WRITE */
325 --- GlideV3.orig/glide3x/h3/glide3/src/gaa.c
326 +++ GlideV3/glide3x/h3/glide3/src/gaa.c
327 @@ -616,7 +616,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count,
331 - (float *)pointers += stride;
332 + pointers = (float *)pointers + stride;
334 ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
335 ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
336 @@ -717,7 +717,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count,
339 oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);
340 - (float *)pointers += stride;
341 + pointers = (float *)pointers + stride;
343 ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
344 *oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
345 @@ -842,9 +842,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 lty
349 - (float *)pointers += stride;
350 + pointers = (float *)pointers + stride;
351 if (ltype == GR_LINES)
352 - (float *)pointers += stride;
353 + pointers = (float *)pointers + stride;
355 /* draw from low Y to high Y */
356 if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) {
357 @@ -1023,9 +1023,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 lty
361 - (float *)pointers += stride;
362 + pointers = (float *)pointers + stride;
363 if (ltype == GR_LINES)
364 - (float *)pointers += stride;
365 + pointers = (float *)pointers + stride;
366 owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset);
367 owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
369 @@ -1037,7 +1037,7 @@ _grAADrawLineStrip(FxI32 mode, FxI32 lty
373 - (float *)pointers += stride;
374 + pointers = (float *)pointers + stride;
375 owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
378 @@ -1373,7 +1373,7 @@ _grAADrawTriangles(FxI32 mode, FxI32 tty
382 - (float *)pointers += stride*3;
383 + pointers = (float *)pointers + stride*3;
385 /* move culling test to here */
387 @@ -1549,7 +1549,7 @@ _grAAVpDrawTriangles(FxI32 mode, FxI32 t
391 - (float *)pointers += stride*3;
392 + pointers = (float *)pointers + stride*3;
393 oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
394 oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
395 oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset);
396 @@ -1716,7 +1716,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mo
397 if (type == kSetupFan) {
398 v[0] = (mode == 0) ? pointers : *(float **)pointers;
400 - (float *)pointers += stride;
401 + pointers = (float *)pointers + stride;
403 v[1] = *(float **)pointers;
404 v[2] = *((float **)pointers+1);
405 @@ -1758,7 +1758,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mo
406 _grAADrawTriangles(1, type, 3, v);
408 _grAAVpDrawTriangles(1, type, 3, v);
409 - (float *)pointers += stride;
410 + pointers = (float *)pointers + stride;
414 --- GlideV3.orig/glide3x/h3/glide3/src/gdraw.c
415 +++ GlideV3/glide3x/h3/glide3/src/gdraw.c
416 @@ -402,7 +402,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, v
418 if (mode) vPtr = *(float **)vPtr;
420 - (float *)pointers += stride;
421 + pointers = (float *)pointers + stride;
423 GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",
424 FARRAY(vPtr,gc->state.vData.vertexInfo.offset),
425 @@ -491,7 +491,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, v
427 vPtr = *(float **)vPtr;
428 oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);
429 - (float *)pointers += stride;
430 + pointers = (float *)pointers + stride;
434 @@ -616,9 +616,9 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype
438 - (float *)pointers += stride;
439 + pointers = (float *)pointers + stride;
440 if (ltype == GR_LINES)
441 - (float *)pointers += stride;
442 + pointers = (float *)pointers + stride;
445 ** compute absolute deltas and draw from low Y to high Y
446 @@ -778,10 +778,10 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype
450 - (float *)pointers += stride;
451 + pointers = (float *)pointers + stride;
452 owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
453 owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
454 - (float *)pointers += stride;
455 + pointers = (float *)pointers + stride;
459 @@ -791,7 +791,7 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype
463 - (float *)pointers += stride;
464 + pointers = (float *)pointers + stride;
465 owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
467 fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
468 @@ -944,7 +944,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI
471 vPtr = *(float **)vPtr;
472 - (float *)pointers += stride;
473 + pointers = (float *)pointers + stride;
475 i = gc->tsuDataList[dataElem];
477 @@ -984,7 +984,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI
478 *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
479 TRI_SETF(FARRAY(vPtr, 4)
480 *oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
481 - (float *)pointers += stride;
482 + pointers = (float *)pointers + stride;
484 TRI_VP_SETFS(vPtr,oow);
486 --- GlideV3.orig/glide3x/h3/glide3/src/gstrip.c
487 +++ GlideV3/glide3x/h3/glide3/src/gstrip.c
488 @@ -190,7 +190,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 ty
491 vPtr = *(float **)vPtr;
492 - (float *)pointers += stride;
493 + pointers = (float *)pointers + stride;
495 TRI_SETF(FARRAY(vPtr, 0));
497 @@ -230,7 +230,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 ty
498 *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
499 TRI_SETF(FARRAY(vPtr, 4)
500 *oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
501 - (float *)pointers += stride;
502 + pointers = (float *)pointers + stride;
504 TRI_VP_SETFS(vPtr, oow);
506 --- GlideV3.orig/glide3x/h3/glide3/src/distrip.c
507 +++ GlideV3/glide3x/h3/glide3/src/distrip.c
508 @@ -450,7 +450,7 @@ GR_DIENTRY(grDrawVertexArray, void , (Fx
510 while ((int)Count >= 3) {
511 grDrawTriangle(*(float **)pointers, *((float **)pointers+1), *((float **)pointers+2));
512 - (float *)pointers += 3;
513 + pointers = (float *)pointers + 3;
517 --- GlideV3/glide3x/h3/glide3/tests/test31.c.orig 2000-03-20 22:51:03.000000000 +0100
518 +++ GlideV3/glide3x/h3/glide3/tests/test31.c 2012-01-09 20:07:05.590126450 +0100
519 @@ -307,12 +307,12 @@
520 packedrgb = !packedrgb;
522 grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
523 - (FxU32)vtxList[0].r = 0xff0000ff;
524 - (FxU32)vtxList[1].r = 0xff00ff00;
525 - (FxU32)vtxList[2].r = 0xffff0000;
526 - (FxU32)vtxList[3].r = 0xffff0000;
527 - (FxU32)vtxList[4].r = 0xff00ff00;
528 - (FxU32)vtxList[5].r = 0xff0000ff;
529 + *(FxU32*)&vtxList[0].r = 0xff0000ff;
530 + *(FxU32*)&vtxList[1].r = 0xff00ff00;
531 + *(FxU32*)&vtxList[2].r = 0xffff0000;
532 + *(FxU32*)&vtxList[3].r = 0xffff0000;
533 + *(FxU32*)&vtxList[4].r = 0xff00ff00;
534 + *(FxU32*)&vtxList[5].r = 0xff0000ff;
537 grVertexLayout(GR_PARAM_RGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
538 --- GlideV3/glide3x/h3/glide3/tests/test32.c.orig 2000-03-20 22:51:03.000000000 +0100
539 +++ GlideV3/glide3x/h3/glide3/tests/test32.c 2012-01-09 20:10:00.906798986 +0100
540 @@ -449,10 +449,10 @@
541 packedrgb = !packedrgb;
543 grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
544 - (FxU32)srcVerts[0].r = 0xff0000ff;
545 - (FxU32)srcVerts[1].r = 0xff00ff00;
546 - (FxU32)srcVerts[2].r = 0xffff0000;
547 - (FxU32)srcVerts[3].r = 0xffff0000;
548 + *(FxU32*)&srcVerts[0].r = 0xff0000ff;
549 + *(FxU32*)&srcVerts[1].r = 0xff00ff00;
550 + *(FxU32*)&srcVerts[2].r = 0xffff0000;
551 + *(FxU32*)&srcVerts[3].r = 0xffff0000;
554 grVertexLayout(GR_PARAM_RGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
555 --- GlideV3/glide3x/h3/glide3/tests/sbench.c.orig 2000-03-20 22:51:03.000000000 +0100
556 +++ GlideV3/glide3x/h3/glide3/tests/sbench.c 2012-01-09 20:31:44.550175970 +0100
557 @@ -281,11 +281,11 @@
561 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] =
562 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] =
563 ((unsigned char) (vPtrArray[v][GR_VERTEX_R_OFFSET]) << 16) |
564 ((unsigned char) (vPtrArray[v][GR_VERTEX_G_OFFSET]) << 8) |
565 ((unsigned char) (vPtrArray[v][GR_VERTEX_B_OFFSET]));
566 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
567 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
570 } else { /* listType == GR_TRIANGLE_FAN */
571 @@ -356,11 +356,11 @@
572 vPtrArray[v][GR_VERTEX_A_OFFSET] = 255.f;
575 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] =
576 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] =
577 ((unsigned char) (vPtrArray[v][GR_VERTEX_R_OFFSET]) << 16) |
578 ((unsigned char) (vPtrArray[v][GR_VERTEX_G_OFFSET]) << 8) |
579 ((unsigned char) (vPtrArray[v][GR_VERTEX_B_OFFSET]));
580 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
581 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;