1 --- GlideV2/glide2x.orig/cvg/glide/tests/display.c
2 +++ GlideV2/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 --- GlideV2/glide2x.orig/cvg/glide/tests/test26.c
27 +++ GlideV2/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 --- GlideV2/glide3x.orig/cvg/glide3/tests/display.c
52 +++ GlideV2/glide3x/cvg/glide3/tests/display.c
53 @@ -56,6 +56,10 @@ static const char *sourceFormatString[]
54 "GR_LFB_SRC_FMT_ZA16 "
57 +static void imageConvert( void *dst,
59 + GrLfbSrcFmt_t format,
62 void main( int argc, char **argv) {
64 @@ -81,11 +85,6 @@ void main( int argc, char **argv) {
65 static FxU32 imageWidth;
66 static FxU32 imageHeight;
68 - static void imageConvert( void *dst,
70 - GrLfbSrcFmt_t format,
76 --- GlideV2/glide3x.orig/cvg/glide3/tests/test26.c
77 +++ GlideV2/glide3x/cvg/glide3/tests/test26.c
78 @@ -48,6 +48,10 @@ static const char *sourceFormatString[]
79 "GR_LFB_SRC_FMT_ZA16 "
82 +static void imageConvert( void *dst,
84 + GrLfbSrcFmt_t format,
87 void main( int argc, char **argv) {
89 @@ -69,11 +73,6 @@ void main( int argc, char **argv) {
90 static FxU32 imageWidth;
91 static FxU32 imageHeight;
93 - static void imageConvert( void *dst,
95 - GrLfbSrcFmt_t format,
98 /* Initialize Glide */
100 assert( hwconfig = tlVoodooType() );
101 --- GlideV2/glide3x/cvg/glide3/src/gaa.c.orig 2000-04-20 23:26:39.000000000 +0200
102 +++ GlideV2/glide3x/cvg/glide3/src/gaa.c 2012-01-09 16:01:27.262966287 +0100
107 - (float *)pointers += stride;
108 + pointers = (float *)pointers + stride;
110 ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
111 ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
115 oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);
116 - (float *)pointers += stride;
117 + pointers = (float *)pointers + stride;
119 ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
120 *oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
125 - (float *)pointers += stride;
126 + pointers = (float *)pointers + stride;
127 if (ltype == GR_LINES)
128 - (float *)pointers += stride;
129 + pointers = (float *)pointers + stride;
131 /* draw from low Y to high Y */
132 if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) {
137 - (float *)pointers += stride;
138 + pointers = (float *)pointers + stride;
139 if (ltype == GR_LINES)
140 - (float *)pointers += stride;
141 + pointers = (float *)pointers + stride;
142 owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset);
143 owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
149 - (float *)pointers += stride;
150 + pointers = (float *)pointers + stride;
151 owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
154 @@ -1304,7 +1304,7 @@
158 - (float *)pointers += stride*3;
159 + pointers = (float *)pointers + stride*3;
161 /* move culling test to here */
163 @@ -1612,7 +1612,7 @@
167 - (float *)pointers += stride*3;
168 + pointers = (float *)pointers + stride*3;
169 oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
170 oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
171 oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset);
172 @@ -1777,7 +1777,7 @@
173 if (type == kSetupFan) {
174 v[0] = (mode == 0) ? pointers : *(float **)pointers;
176 - (float *)pointers += stride;
177 + pointers = (float *)pointers + stride;
179 v[1] = *(float **)pointers;
180 v[2] = *((float **)pointers+1);
181 @@ -1819,7 +1819,7 @@
182 _grAADrawTriangles(1, type, 3, v);
184 _grAAVpDrawTriangles(1, type, 3, v);
185 - (float *)pointers += stride;
186 + pointers = (float *)pointers + stride;
190 --- GlideV2/glide3x/cvg/glide3/src/gdraw.c.orig 2000-04-20 23:26:39.000000000 +0200
191 +++ GlideV2/glide3x/cvg/glide3/src/gdraw.c 2012-01-09 16:06:50.666310453 +0100
194 if (mode) vPtr = *(float **)vPtr;
196 - (float *)pointers += stride;
197 + pointers = (float *)pointers + stride;
199 GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",
200 FARRAY(vPtr,gc->state.vData.vertexInfo.offset),
203 vPtr = *(float **)vPtr;
204 oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);
205 - (float *)pointers += stride;
206 + pointers = (float *)pointers + stride;
214 - (float *)pointers += stride;
215 + pointers = (float *)pointers + stride;
216 if (ltype == GR_LINES)
217 - (float *)pointers += stride;
218 + pointers = (float *)pointers + stride;
221 ** compute absolute deltas and draw from low Y to high Y
222 @@ -828,10 +828,10 @@
226 - (float *)pointers += stride;
227 + pointers = (float *)pointers + stride;
228 owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
229 owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
230 - (float *)pointers += stride;
231 + pointers = (float *)pointers + stride;
239 - (float *)pointers += stride;
240 + pointers = (float *)pointers + stride;
241 owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
243 fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
244 @@ -1011,7 +1011,7 @@
247 vPtr = *(float **)vPtr;
248 - (float *)pointers += stride;
249 + pointers = (float *)pointers + stride;
251 i = gc->tsuDataList[dataElem];
253 @@ -1051,7 +1051,7 @@
254 *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
255 TRI_SETF(FARRAY(vPtr, 4)
256 *oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
257 - (float *)pointers += stride;
258 + pointers = (float *)pointers + stride;
260 TRI_VP_SETFS(vPtr,oow);
262 --- GlideV2/glide3x/cvg/glide3/tests/test31.c.orig 2000-04-20 23:26:39.000000000 +0200
263 +++ GlideV2/glide3x/cvg/glide3/tests/test31.c 2012-01-09 17:08:13.793100443 +0100
264 @@ -307,12 +307,12 @@
265 packedrgb = !packedrgb;
267 grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
268 - (FxU32)vtxList[0].r = 0xff0000ff;
269 - (FxU32)vtxList[1].r = 0xff00ff00;
270 - (FxU32)vtxList[2].r = 0xffff0000;
271 - (FxU32)vtxList[3].r = 0xffff0000;
272 - (FxU32)vtxList[4].r = 0xff00ff00;
273 - (FxU32)vtxList[5].r = 0xff0000ff;
274 + *(FxU32*)&vtxList[0].r = 0xff0000ff;
275 + *(FxU32*)&vtxList[1].r = 0xff00ff00;
276 + *(FxU32*)&vtxList[2].r = 0xffff0000;
277 + *(FxU32*)&vtxList[3].r = 0xffff0000;
278 + *(FxU32*)&vtxList[4].r = 0xff00ff00;
279 + *(FxU32*)&vtxList[5].r = 0xff0000ff;
282 grVertexLayout(GR_PARAM_RGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
283 --- GlideV2/glide3x/cvg/glide3/tests/test32.c.orig 2000-04-20 23:26:39.000000000 +0200
284 +++ GlideV2/glide3x/cvg/glide3/tests/test32.c 2012-01-09 17:13:56.743111927 +0100
285 @@ -449,10 +449,10 @@
286 packedrgb = !packedrgb;
288 grVertexLayout(GR_PARAM_PARGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
289 - (FxU32)srcVerts[0].r = 0xff0000ff;
290 - (FxU32)srcVerts[1].r = 0xff00ff00;
291 - (FxU32)srcVerts[2].r = 0xffff0000;
292 - (FxU32)srcVerts[3].r = 0xffff0000;
293 + *(FxU32*)&srcVerts[0].r = 0xff0000ff;
294 + *(FxU32*)&srcVerts[1].r = 0xff00ff00;
295 + *(FxU32*)&srcVerts[2].r = 0xffff0000;
296 + *(FxU32*)&srcVerts[3].r = 0xffff0000;
299 grVertexLayout(GR_PARAM_RGB, GR_VERTEX_R_OFFSET << 2, GR_PARAM_ENABLE);
300 --- GlideV2/glide3x/cvg/glide3/tests/sbench.c.orig 2000-04-20 23:26:39.000000000 +0200
301 +++ GlideV2/glide3x/cvg/glide3/tests/sbench.c 2012-01-09 17:50:20.359851708 +0100
302 @@ -281,11 +281,11 @@
306 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] =
307 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] =
308 ((unsigned char) (vPtrArray[v][GR_VERTEX_R_OFFSET]) << 16) |
309 ((unsigned char) (vPtrArray[v][GR_VERTEX_G_OFFSET]) << 8) |
310 ((unsigned char) (vPtrArray[v][GR_VERTEX_B_OFFSET]));
311 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
312 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
315 } else { /* listType == GR_TRIANGLE_FAN */
316 @@ -356,11 +356,11 @@
317 vPtrArray[v][GR_VERTEX_A_OFFSET] = 255.f;
320 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] =
321 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] =
322 ((unsigned char) (vPtrArray[v][GR_VERTEX_R_OFFSET]) << 16) |
323 ((unsigned char) (vPtrArray[v][GR_VERTEX_G_OFFSET]) << 8) |
324 ((unsigned char) (vPtrArray[v][GR_VERTEX_B_OFFSET]));
325 - (FxU32) vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
326 + *(FxU32*) &vPtrArray[v][GR_VERTEX_R_OFFSET] |= 0xff000000;
330 --- GlideV2/glide3x/cvg/glide3/src/gstrip.c.orig 2000-04-20 23:26:39.000000000 +0200
331 +++ GlideV2/glide3x/cvg/glide3/src/gstrip.c 2013-09-21 14:11:46.981730876 +0200
335 vPtr = *(float **)vPtr;
336 - (float *)pointers += stride;
337 + pointers = (float *)pointers + stride;
339 TRI_SETF(FARRAY(vPtr, 0));
342 *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
343 TRI_SETF(FARRAY(vPtr, 4)
344 *oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
345 - (float *)pointers += stride;
346 + pointers = (float *)pointers + stride;
348 TRI_VP_SETFS(vPtr, oow);