]>
Commit | Line | Data |
---|---|---|
e2105240 JB |
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[] | |
4 | "GR_LFB_SRC_FMT_ZA16 " | |
5 | }; | |
6 | ||
7 | +static void imageConvert( void *dst, | |
8 | + void *src, | |
9 | + GrLfbSrcFmt_t format, | |
10 | + FxU32 *bpp ); | |
11 | ||
12 | int main( int argc, char **argv) | |
13 | { | |
14 | @@ -91,11 +95,6 @@ int main( int argc, char **argv) | |
15 | static FxU32 imageWidth; | |
16 | static FxU32 imageHeight; | |
17 | ||
18 | - static void imageConvert( void *dst, | |
19 | - void *src, | |
20 | - GrLfbSrcFmt_t format, | |
21 | - FxU32 *bpp ); | |
22 | - | |
23 | srcfname[0] = 0; | |
24 | dstfname[0] = 0; | |
25 | ||
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 " | |
30 | }; | |
31 | ||
32 | +static void imageConvert( void *dst, | |
33 | + void *src, | |
34 | + GrLfbSrcFmt_t format, | |
35 | + FxU32 *bpp ); | |
36 | ||
37 | int main( int argc, char **argv) { | |
38 | char match; | |
39 | @@ -80,11 +84,6 @@ int main( int argc, char **argv) { | |
40 | static FxU32 imageWidth; | |
41 | static FxU32 imageHeight; | |
42 | ||
43 | - static void imageConvert( void *dst, | |
44 | - void *src, | |
45 | - GrLfbSrcFmt_t format, | |
46 | - FxU32 *bpp ); | |
47 | - | |
48 | /* Process Command Line Arguments */ | |
49 | while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) { | |
50 | if ( rv == -1 ) { | |
51 | --- GlideV3.orig/glide2x/h3/glide/src/xdraw2.inc.S | |
52 | +++ GlideV3/glide2x/h3/glide/src/xdraw2.inc.S | |
53 | @@ -41,13 +41,18 @@ | |
54 | ||
55 | .file "xdraw2.inc" | |
56 | ||
57 | -#ifdef GL_AMD3D | |
58 | - | |
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 */ | |
64 | +#endif | |
65 | ||
66 | +#ifdef GL_AMD3D | |
67 | + | |
68 | ||
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 */ | |
74 | @@ -55,6 +60,7 @@ | |
75 | .MACRO WRITE_MM1LOW_FIFO | |
76 | movd %mm1 , (%ebp) /* store current param | previous param */ | |
77 | .ENDM /* WRITE_MM1LOW_FIFO */ | |
78 | +#endif | |
79 | ||
80 | #define gc %edi /* points to graphics context */ | |
81 | #define fifo %ebp /* points to fifo entries */ | |
82 | @@ -1103,10 +1109,6 @@ LOCAL(Area_Computation): | |
83 | #define packCol %edi | |
84 | #define tempVal %edi | |
85 | ||
86 | -.MACRO GR_FIFO_WRITE __addr __offset __data | |
87 | - mov \__data , \__offset(\__addr) | |
88 | -.ENDM /* GR_FIFO_WRITE */ | |
89 | - | |
90 | .align 4 | |
91 | LOCAL(__triBegin): | |
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 " | |
97 | }; | |
98 | ||
99 | +static void imageConvert( void *dst, | |
100 | + void *src, | |
101 | + GrLfbSrcFmt_t format, | |
102 | + FxU32 *bpp ); | |
103 | ||
104 | int main( int argc, char **argv) | |
105 | { | |
106 | @@ -91,11 +95,6 @@ int main( int argc, char **argv) | |
107 | static FxU32 imageWidth; | |
108 | static FxU32 imageHeight; | |
109 | ||
110 | - static void imageConvert( void *dst, | |
111 | - void *src, | |
112 | - GrLfbSrcFmt_t format, | |
113 | - FxU32 *bpp ); | |
114 | - | |
115 | srcfname[0] = 0; | |
116 | dstfname[0] = 0; | |
117 | ||
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 " | |
122 | }; | |
123 | ||
124 | +static void imageConvert( void *dst, | |
125 | + void *src, | |
126 | + GrLfbSrcFmt_t format, | |
127 | + FxU32 *bpp ); | |
128 | ||
129 | int main( int argc, char **argv) { | |
130 | char match; | |
131 | @@ -80,11 +84,6 @@ int main( int argc, char **argv) { | |
132 | static FxU32 imageWidth; | |
133 | static FxU32 imageHeight; | |
134 | ||
135 | - static void imageConvert( void *dst, | |
136 | - void *src, | |
137 | - GrLfbSrcFmt_t format, | |
138 | - FxU32 *bpp ); | |
139 | - | |
140 | /* Process Command Line Arguments */ | |
141 | while( (rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs )) ) { | |
142 | if ( rv == -1 ) { | |
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 " | |
147 | }; | |
148 | ||
149 | +static void imageConvert( void *dst, | |
150 | + void *src, | |
151 | + GrLfbSrcFmt_t format, | |
152 | + FxU32 *bpp ); | |
153 | ||
154 | void main( int argc, char **argv) { | |
155 | char match; | |
156 | @@ -95,11 +99,6 @@ void main( int argc, char **argv) { | |
157 | static FxU32 imageWidth; | |
158 | static FxU32 imageHeight; | |
159 | ||
160 | - static void imageConvert( void *dst, | |
161 | - void *src, | |
162 | - GrLfbSrcFmt_t format, | |
163 | - FxU32 *bpp ); | |
164 | - | |
165 | srcfname[0] = 0; | |
166 | dstfname[0] = 0; | |
167 | ||
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 " | |
172 | }; | |
173 | ||
174 | +static void imageConvert( void *dst, | |
175 | + void *src, | |
176 | + GrLfbSrcFmt_t format, | |
177 | + FxU32 *bpp ); | |
178 | ||
179 | void main( int argc, char **argv) { | |
180 | char match; | |
181 | @@ -85,11 +89,6 @@ void main( int argc, char **argv) { | |
182 | static FxU32 imageWidth; | |
183 | static FxU32 imageHeight; | |
184 | ||
185 | - static void imageConvert( void *dst, | |
186 | - void *src, | |
187 | - GrLfbSrcFmt_t format, | |
188 | - FxU32 *bpp ); | |
189 | - | |
190 | /* Process Command Line Arguments */ | |
191 | while( rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs ) ) { | |
192 | if ( rv == -1 ) { | |
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 " | |
197 | }; | |
198 | ||
199 | +static void imageConvert( void *dst, | |
200 | + void *src, | |
201 | + GrLfbSrcFmt_t format, | |
202 | + FxU32 *bpp ); | |
203 | ||
204 | void main( int argc, char **argv) { | |
205 | char match; | |
206 | @@ -81,11 +85,6 @@ void main( int argc, char **argv) { | |
207 | static FxU32 imageWidth; | |
208 | static FxU32 imageHeight; | |
209 | ||
210 | - static void imageConvert( void *dst, | |
211 | - void *src, | |
212 | - GrLfbSrcFmt_t format, | |
213 | - FxU32 *bpp ); | |
214 | - | |
215 | srcfname[0] = 0; | |
216 | dstfname[0] = 0; | |
217 | ||
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 " | |
222 | }; | |
223 | ||
224 | +static void imageConvert( void *dst, | |
225 | + void *src, | |
226 | + GrLfbSrcFmt_t format, | |
227 | + FxU32 *bpp ); | |
228 | ||
229 | void main( int argc, char **argv) { | |
230 | char match; | |
231 | @@ -69,11 +73,6 @@ void main( int argc, char **argv) { | |
232 | static FxU32 imageWidth; | |
233 | static FxU32 imageHeight; | |
234 | ||
235 | - static void imageConvert( void *dst, | |
236 | - void *src, | |
237 | - GrLfbSrcFmt_t format, | |
238 | - FxU32 *bpp ); | |
239 | - | |
240 | /* Initialize Glide */ | |
241 | grGlideInit(); | |
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 " | |
247 | }; | |
248 | ||
249 | +static void imageConvert( void *dst, | |
250 | + void *src, | |
251 | + GrLfbSrcFmt_t format, | |
252 | + FxU32 *bpp ); | |
253 | ||
254 | void main( int argc, char **argv) { | |
255 | char match; | |
256 | @@ -81,11 +85,6 @@ void main( int argc, char **argv) { | |
257 | static FxU32 imageWidth; | |
258 | static FxU32 imageHeight; | |
259 | ||
260 | - static void imageConvert( void *dst, | |
261 | - void *src, | |
262 | - GrLfbSrcFmt_t format, | |
263 | - FxU32 *bpp ); | |
264 | - | |
265 | srcfname[0] = 0; | |
266 | dstfname[0] = 0; | |
267 | ||
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 " | |
272 | }; | |
273 | ||
274 | +static void imageConvert( void *dst, | |
275 | + void *src, | |
276 | + GrLfbSrcFmt_t format, | |
277 | + FxU32 *bpp ); | |
278 | ||
279 | void main( int argc, char **argv) { | |
280 | char match; | |
281 | @@ -69,11 +73,6 @@ void main( int argc, char **argv) { | |
282 | static FxU32 imageWidth; | |
283 | static FxU32 imageHeight; | |
284 | ||
285 | - static void imageConvert( void *dst, | |
286 | - void *src, | |
287 | - GrLfbSrcFmt_t format, | |
288 | - FxU32 *bpp ); | |
289 | - | |
290 | /* Initialize Glide */ | |
291 | grGlideInit(); | |
292 | assert( hwconfig = tlVoodooType() ); | |
293 | --- GlideV3.orig/glide3x/h3/glide3/src/xdraw2.inc.S | |
294 | +++ GlideV3/glide3x/h3/glide3/src/xdraw2.inc.S | |
295 | @@ -59,6 +59,8 @@ | |
296 | .file "xdraw2.inc.S" | |
297 | ||
298 | ||
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 */ | |
304 | @@ -72,6 +74,7 @@ | |
305 | .macro WRITE_MM1LOW_FIFO | |
306 | movd %mm1 , (%ebp) /* store current param | previous param */ | |
307 | .endm /* WRITE_MM1LOW_FIFO */ | |
308 | +#endif | |
309 | ||
310 | ||
311 | #if 0 | |
312 | @@ -815,9 +818,12 @@ LOCAL(nocull): | |
313 | #define packCol %edi | |
314 | #define tempVal %edi | |
315 | ||
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 */ | |
321 | +#endif | |
322 | ||
323 | .align 4 | |
324 | LOCAL(__triBegin): | |
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, | |
328 | e = pointers; | |
329 | if (mode) | |
330 | e = *(float **)e; | |
331 | - (float *)pointers += stride; | |
332 | + pointers = (float *)pointers + stride; | |
333 | ||
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, | |
337 | if (mode) | |
338 | e = *(float **)e; | |
339 | oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset); | |
340 | - (float *)pointers += stride; | |
341 | + pointers = (float *)pointers + stride; | |
342 | ||
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 | |
346 | v1 = *(float **)v1; | |
347 | v2 = *(float **)v2; | |
348 | } | |
349 | - (float *)pointers += stride; | |
350 | + pointers = (float *)pointers + stride; | |
351 | if (ltype == GR_LINES) | |
352 | - (float *)pointers += stride; | |
353 | + pointers = (float *)pointers + stride; | |
354 | ||
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 | |
358 | v1 = *(float **)v1; | |
359 | v2 = *(float **)v2; | |
360 | } | |
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); | |
368 | } | |
369 | @@ -1037,7 +1037,7 @@ _grAADrawLineStrip(FxI32 mode, FxI32 lty | |
370 | v1 = *(float **)v1; | |
371 | v2 = *(float **)v2; | |
372 | } | |
373 | - (float *)pointers += stride; | |
374 | + pointers = (float *)pointers + stride; | |
375 | owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset); | |
376 | } | |
377 | ||
378 | @@ -1373,7 +1373,7 @@ _grAADrawTriangles(FxI32 mode, FxI32 tty | |
379 | b = *(float **)b; | |
380 | c = *(float **)c; | |
381 | } | |
382 | - (float *)pointers += stride*3; | |
383 | + pointers = (float *)pointers + stride*3; | |
384 | ||
385 | /* move culling test to here */ | |
386 | { | |
387 | @@ -1549,7 +1549,7 @@ _grAAVpDrawTriangles(FxI32 mode, FxI32 t | |
388 | b = *(float **)b; | |
389 | c = *(float **)c; | |
390 | } | |
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; | |
399 | while (sCount--) { | |
400 | - (float *)pointers += stride; | |
401 | + pointers = (float *)pointers + stride; | |
402 | if (mode) { | |
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); | |
407 | else | |
408 | _grAAVpDrawTriangles(1, type, 3, v); | |
409 | - (float *)pointers += stride; | |
410 | + pointers = (float *)pointers + stride; | |
411 | flip = ~flip; | |
412 | } | |
413 | flip = ~flip; | |
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 | |
417 | vPtr = pointers; | |
418 | if (mode) vPtr = *(float **)vPtr; | |
419 | ||
420 | - (float *)pointers += stride; | |
421 | + pointers = (float *)pointers + stride; | |
422 | ||
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 | |
426 | if (mode) | |
427 | vPtr = *(float **)vPtr; | |
428 | oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset); | |
429 | - (float *)pointers += stride; | |
430 | + pointers = (float *)pointers + stride; | |
431 | ||
432 | { | |
433 | FxU32 x, y; | |
434 | @@ -616,9 +616,9 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype | |
435 | a = *(float **)a; | |
436 | b = *(float **)b; | |
437 | } | |
438 | - (float *)pointers += stride; | |
439 | + pointers = (float *)pointers + stride; | |
440 | if (ltype == GR_LINES) | |
441 | - (float *)pointers += stride; | |
442 | + pointers = (float *)pointers + stride; | |
443 | ||
444 | /* | |
445 | ** compute absolute deltas and draw from low Y to high Y | |
446 | @@ -778,10 +778,10 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype | |
447 | a = *(float **)a; | |
448 | b = *(float **)b; | |
449 | } | |
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; | |
456 | } | |
457 | else { | |
458 | owa = oowa = oowb; | |
459 | @@ -791,7 +791,7 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype | |
460 | a = *(float **)a; | |
461 | b = *(float **)b; | |
462 | } | |
463 | - (float *)pointers += stride; | |
464 | + pointers = (float *)pointers + stride; | |
465 | owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset); | |
466 | } | |
467 | fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4) | |
468 | @@ -944,7 +944,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI | |
469 | vPtr = pointers; | |
470 | if (mode) | |
471 | vPtr = *(float **)vPtr; | |
472 | - (float *)pointers += stride; | |
473 | + pointers = (float *)pointers + stride; | |
474 | ||
475 | i = gc->tsuDataList[dataElem]; | |
476 | ||
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; | |
483 | ||
484 | TRI_VP_SETFS(vPtr,oow); | |
485 | } | |
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 | |
489 | vPtr = pointers; | |
490 | if (mode) | |
491 | vPtr = *(float **)vPtr; | |
492 | - (float *)pointers += stride; | |
493 | + pointers = (float *)pointers + stride; | |
494 | ||
495 | TRI_SETF(FARRAY(vPtr, 0)); | |
496 | dataElem = 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; | |
503 | ||
504 | TRI_VP_SETFS(vPtr, oow); | |
505 | } | |
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 | |
509 | else { | |
510 | while ((int)Count >= 3) { | |
511 | grDrawTriangle(*(float **)pointers, *((float **)pointers+1), *((float **)pointers+2)); | |
512 | - (float *)pointers += 3; | |
513 | + pointers = (float *)pointers + 3; | |
514 | Count -= 3; | |
515 | } | |
516 | } | |
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; | |
521 | if (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; | |
535 | } | |
536 | else { | |
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; | |
542 | if (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; | |
552 | } | |
553 | else { | |
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 @@ | |
558 | 0.5f, 0.5f); | |
559 | ||
560 | if (packedrgb) { | |
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; | |
568 | } | |
569 | } | |
570 | } else { /* listType == GR_TRIANGLE_FAN */ | |
571 | @@ -356,11 +356,11 @@ | |
572 | vPtrArray[v][GR_VERTEX_A_OFFSET] = 255.f; | |
573 | } | |
574 | if (packedrgb) { | |
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; | |
582 | } | |
583 | } | |
584 | #endif |