]> git.pld-linux.org Git - packages/Glide_V2.git/blame - glide-gcc4.patch
projects / packages / Glide_V2.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- rediffed patches, pass AR to remove 'l' option, which changed meaning
[packages/Glide_V2.git] / glide-gcc4.patch
CommitLineData
4d7201fd
JB		 1--- GlideV2/glide2x/cvg/glide/tests/display.c.orig 2000-04-20 23:26:36.000000000 +0200
2+++ GlideV2/glide2x/cvg/glide/tests/display.c 2022-09-26 18:54:14.561599102 +0200
3@@ -67,6 +67,10 @@ static const char *sourceFormatString[]
a803064a
JB		 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
4d7201fd
JB		 12 void main( int argc, char **argv) {
13 char match;
14@@ -92,11 +96,6 @@ void main( int argc, char **argv) {
a803064a
JB		 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
4d7201fd
JB		 26--- GlideV2/glide2x/cvg/glide/tests/test26.c.orig 2022-09-26 18:51:04.199297049 +0200
27+++ GlideV2/glide2x/cvg/glide/tests/test26.c 2022-09-26 18:55:25.641214031 +0200
28@@ -59,6 +59,10 @@ static const char *sourceFormatString[]
a803064a
JB		 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
4d7201fd 37 void main( int argc, char **argv) {
a803064a 38 char match;
4d7201fd 39@@ -82,11 +86,6 @@ void main( int argc, char **argv) {
a803064a
JB		 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 */
4d7201fd 49 while( rv = tlGetOpt( argc, argv, "bdnr", &match, &remArgs ) ) {
a803064a
JB		 50 if ( rv == -1 ) {
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 "
55 };
56
57+static void imageConvert( void *dst,
58+ void *src,
59+ GrLfbSrcFmt_t format,
60+ FxU32 *bpp );
61
62 void main( int argc, char **argv) {
63 char match;
64@@ -81,11 +85,6 @@ void main( int argc, char **argv) {
65 static FxU32 imageWidth;
66 static FxU32 imageHeight;
67
68- static void imageConvert( void *dst,
69- void *src,
70- GrLfbSrcFmt_t format,
71- FxU32 *bpp );
72-
73 srcfname[0] = 0;
74 dstfname[0] = 0;
75
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 "
80 };
81
82+static void imageConvert( void *dst,
83+ void *src,
84+ GrLfbSrcFmt_t format,
85+ FxU32 *bpp );
86
87 void main( int argc, char **argv) {
88 char match;
89@@ -69,11 +73,6 @@ void main( int argc, char **argv) {
90 static FxU32 imageWidth;
91 static FxU32 imageHeight;
92
93- static void imageConvert( void *dst,
94- void *src,
95- GrLfbSrcFmt_t format,
96- FxU32 *bpp );
97-
98 /* Initialize Glide */
99 grGlideInit();
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
103@@ -572,7 +572,7 @@
104 e = pointers;
105 if (mode)
106 e = *(float **)e;
107- (float *)pointers += stride;
108+ pointers = (float *)pointers + stride;
109
110 ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
111 ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
112@@ -673,7 +673,7 @@
113 if (mode)
114 e = *(float **)e;
115 oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);
116- (float *)pointers += stride;
117+ pointers = (float *)pointers + stride;
118
119 ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
120 *oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
121@@ -790,9 +790,9 @@
122 v1 = *(float **)v1;
123 v2 = *(float **)v2;
124 }
125- (float *)pointers += stride;
126+ pointers = (float *)pointers + stride;
127 if (ltype == GR_LINES)
128- (float *)pointers += stride;
129+ pointers = (float *)pointers + stride;
130
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)) {
133@@ -966,9 +966,9 @@
134 v1 = *(float **)v1;
135 v2 = *(float **)v2;
136 }
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);
144 }
145@@ -980,7 +980,7 @@
146 v1 = *(float **)v1;
147 v2 = *(float **)v2;
148 }
149- (float *)pointers += stride;
150+ pointers = (float *)pointers + stride;
151 owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
152 }
153
154@@ -1304,7 +1304,7 @@
155 b = *(float **)b;
156 c = *(float **)c;
157 }
158- (float *)pointers += stride*3;
159+ pointers = (float *)pointers + stride*3;
160
161 /* move culling test to here */
162 {
163@@ -1612,7 +1612,7 @@
164 b = *(float **)b;
165 c = *(float **)c;
166 }
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;
175 while (sCount--) {
176- (float *)pointers += stride;
177+ pointers = (float *)pointers + stride;
178 if (mode) {
179 v[1] = *(float **)pointers;
180 v[2] = *((float **)pointers+1);
181@@ -1819,7 +1819,7 @@
182 _grAADrawTriangles(1, type, 3, v);
183 else
184 _grAAVpDrawTriangles(1, type, 3, v);
185- (float *)pointers += stride;
186+ pointers = (float *)pointers + stride;
187 flip = ~flip;
188 }
189 flip = ~flip;
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
192@@ -457,7 +457,7 @@
193 vPtr = pointers;
194 if (mode) vPtr = *(float **)vPtr;
195
196- (float *)pointers += stride;
197+ pointers = (float *)pointers + stride;
198
199 GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",
200 FARRAY(vPtr,gc->state.vData.vertexInfo.offset),
201@@ -546,7 +546,7 @@
202 if (mode)
203 vPtr = *(float **)vPtr;
204 oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);
205- (float *)pointers += stride;
206+ pointers = (float *)pointers + stride;
207
208 {
209 FxU32 x, y;
210@@ -666,9 +666,9 @@
211 a = *(float **)a;
212 b = *(float **)b;
213 }
214- (float *)pointers += stride;
215+ pointers = (float *)pointers + stride;
216 if (ltype == GR_LINES)
217- (float *)pointers += stride;
218+ pointers = (float *)pointers + stride;
219
220 /*
221 ** compute absolute deltas and draw from low Y to high Y
222@@ -828,10 +828,10 @@
223 a = *(float **)a;
224 b = *(float **)b;
225 }
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;
232 }
233 else {
234 owa = oowa = oowb;
235@@ -841,7 +841,7 @@
236 a = *(float **)a;
237 b = *(float **)b;
238 }
239- (float *)pointers += stride;
240+ pointers = (float *)pointers + stride;
241 owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
242 }
243 fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
244@@ -1011,7 +1011,7 @@
245 vPtr = pointers;
246 if (mode)
247 vPtr = *(float **)vPtr;
248- (float *)pointers += stride;
249+ pointers = (float *)pointers + stride;
250
251 i = gc->tsuDataList[dataElem];
252
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;
259
260 TRI_VP_SETFS(vPtr,oow);
261 }
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;
266 if (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;
280 }
281 else {
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;
287 if (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;
297 }
298 else {
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 @@
303 0.5f, 0.5f);
304
305 if (packedrgb) {
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;
313 }
314 }
315 } else { /* listType == GR_TRIANGLE_FAN */
316@@ -356,11 +356,11 @@
317 vPtrArray[v][GR_VERTEX_A_OFFSET] = 255.f;
318 }
319 if (packedrgb) {
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;
327 }
328 }
329 #endif
13e3f2a3
JB		 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
332@@ -248,7 +248,7 @@
333 vPtr = pointers;
334 if (mode)
335 vPtr = *(float **)vPtr;
336- (float *)pointers += stride;
337+ pointers = (float *)pointers + stride;
338
339 TRI_SETF(FARRAY(vPtr, 0));
340 dataElem = 0;
341@@ -350,7 +350,7 @@
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;
347
348 TRI_VP_SETFS(vPtr, oow);
349 #endif
Glide runtime for 3Dfx Voodoo2 boards
This page took 0.11481 seconds and 4 git commands to generate.