]>
Commit | Line | Data |
---|---|---|
726b015b SS |
1 | --- glide3x-20010309-orig/h3/glide3/src/gaa.c 2006-06-03 00:42:40.000000000 +0000 |
2 | +++ glide3x-20010309/h3/glide3/src/gaa.c 2006-06-03 00:47:11.000000000 +0000 | |
3 | @@ -614,7 +614,7 @@ | |
4 | e = pointers; | |
5 | if (mode) | |
6 | e = *(float **)e; | |
7 | - (float *)pointers += stride; | |
8 | + pointers = (float *)pointers + stride; | |
9 | ||
10 | ptX = FARRAY(e, gc->state.vData.vertexInfo.offset); | |
11 | ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4); | |
12 | @@ -715,7 +715,7 @@ | |
13 | if (mode) | |
14 | e = *(float **)e; | |
15 | oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset); | |
16 | - (float *)pointers += stride; | |
17 | + pointers = (float *)pointers + stride; | |
18 | ||
19 | ptX = FARRAY(e, gc->state.vData.vertexInfo.offset) | |
20 | *oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox; | |
21 | @@ -837,9 +837,9 @@ | |
22 | v1 = *(float **)v1; | |
23 | v2 = *(float **)v2; | |
24 | } | |
25 | - (float *)pointers += stride; | |
26 | + pointers = (float *)pointers + stride; | |
27 | if (ltype == GR_LINES) | |
28 | - (float *)pointers += stride; | |
29 | + pointers = (float *)pointers + stride; | |
30 | ||
31 | /* draw from low Y to high Y */ | |
32 | if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) { | |
33 | @@ -1018,9 +1018,9 @@ | |
34 | v1 = *(float **)v1; | |
35 | v2 = *(float **)v2; | |
36 | } | |
37 | - (float *)pointers += stride; | |
38 | + pointers = (float *)pointers + stride; | |
39 | if (ltype == GR_LINES) | |
40 | - (float *)pointers += stride; | |
41 | + pointers = (float *)pointers + stride; | |
42 | owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset); | |
43 | owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset); | |
44 | } | |
45 | @@ -1032,7 +1032,7 @@ | |
46 | v1 = *(float **)v1; | |
47 | v2 = *(float **)v2; | |
48 | } | |
49 | - (float *)pointers += stride; | |
50 | + pointers = (float *)pointers + stride; | |
51 | owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset); | |
52 | } | |
53 | ||
54 | @@ -1366,7 +1366,7 @@ | |
55 | b = *(float **)b; | |
56 | c = *(float **)c; | |
57 | } | |
58 | - (float *)pointers += stride*3; | |
59 | + pointers = (float *)pointers + stride * 3; | |
60 | ||
61 | /* move culling test to here */ | |
62 | { | |
63 | @@ -1540,7 +1540,7 @@ | |
64 | b = *(float **)b; | |
65 | c = *(float **)c; | |
66 | } | |
67 | - (float *)pointers += stride*3; | |
68 | + pointers = (float *)pointers + stride * 3; | |
69 | oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset); | |
70 | oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset); | |
71 | oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset); | |
72 | @@ -1705,7 +1705,7 @@ | |
73 | if (type == kSetupFan) { | |
74 | v[0] = (mode == 0) ? pointers : *(float **)pointers; | |
75 | while (sCount--) { | |
76 | - (float *)pointers += stride; | |
77 | + pointers = (float *)pointers + stride; | |
78 | if (mode) { | |
79 | v[1] = *(float **)pointers; | |
80 | v[2] = *((float **)pointers+1); | |
81 | @@ -1747,7 +1747,7 @@ | |
82 | _grAADrawTriangles(1, type, 3, v); | |
83 | else | |
84 | _grAAVpDrawTriangles(1, type, 3, v); | |
85 | - (float *)pointers += stride; | |
86 | + pointers = (float *)pointers + stride; | |
87 | flip = ~flip; | |
88 | } | |
89 | flip = ~flip; | |
90 | --- glide3x-20010309-orig/h3/glide3/src/gdraw.c 2006-06-03 00:42:40.000000000 +0000 | |
91 | +++ glide3x-20010309/h3/glide3/src/gdraw.c 2006-06-03 04:30:48.000000000 +0000 | |
92 | @@ -403,7 +403,7 @@ | |
93 | vPtr = pointers; | |
94 | if (mode) vPtr = *(float **)vPtr; | |
95 | ||
96 | - (float *)pointers += stride; | |
97 | + pointers = (float *)pointers + stride; | |
98 | ||
99 | GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n", | |
100 | FARRAY(vPtr,gc->state.vData.vertexInfo.offset), | |
101 | @@ -492,7 +492,7 @@ | |
102 | if (mode) | |
103 | vPtr = *(float **)vPtr; | |
104 | oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset); | |
105 | - (float *)pointers += stride; | |
106 | + pointers = (float *)pointers + stride; | |
107 | ||
108 | { | |
109 | FxU32 x, y; | |
110 | @@ -617,9 +617,9 @@ | |
111 | a = *(float **)a; | |
112 | b = *(float **)b; | |
113 | } | |
114 | - (float *)pointers += stride; | |
115 | + pointers = (float *)pointers + stride; | |
116 | if (ltype == GR_LINES) | |
117 | - (float *)pointers += stride; | |
118 | + pointers = (float *)pointers + stride; | |
119 | ||
120 | /* | |
121 | ** compute absolute deltas and draw from low Y to high Y | |
122 | @@ -779,10 +779,10 @@ | |
123 | a = *(float **)a; | |
124 | b = *(float **)b; | |
125 | } | |
126 | - (float *)pointers += stride; | |
127 | + pointers = (float *)pointers + stride; | |
128 | owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset); | |
129 | owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset); | |
130 | - (float *)pointers += stride; | |
131 | + pointers = (float *)pointers + stride; | |
132 | } | |
133 | else { | |
134 | owa = oowa = oowb; | |
135 | @@ -792,7 +792,7 @@ | |
136 | a = *(float **)a; | |
137 | b = *(float **)b; | |
138 | } | |
139 | - (float *)pointers += stride; | |
140 | + pointers = (float *)pointers + stride; | |
141 | owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset); | |
142 | } | |
143 | fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4) | |
144 | @@ -944,7 +944,7 @@ | |
145 | vPtr = pointers; | |
146 | if (mode) | |
147 | vPtr = *(float **)vPtr; | |
148 | - (float *)pointers += stride; | |
149 | + pointers = (float *)pointers + stride; | |
150 | ||
151 | i = gc->tsuDataList[dataElem]; | |
152 | ||
153 | @@ -984,7 +984,7 @@ | |
154 | *oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox); | |
155 | TRI_SETF(FARRAY(vPtr, 4) | |
156 | *oow*gc->state.Viewport.hheight + gc->state.Viewport.oy); | |
157 | - (float *)pointers += stride; | |
158 | + pointers = (float *)pointers + stride; | |
159 | ||
160 | TRI_VP_SETFS(vPtr,oow); | |
161 | } | |
162 | --- glide3x-20010309-orig/h3/glide3/src/distrip.c 2006-06-03 00:42:40.000000000 +0000 | |
163 | +++ glide3x-20010309/h3/glide3/src/distrip.c 2006-06-03 06:33:03.000000000 +0000 | |
164 | @@ -450,7 +450,7 @@ | |
165 | else { | |
166 | while ((int)Count >= 3) { | |
167 | grDrawTriangle(*(float **)pointers, *((float **)pointers+1), *((float **)pointers+2)); | |
168 | - (float *)pointers += 3; | |
169 | + pointers = (float *)pointers + 3; | |
170 | Count -= 3; | |
171 | } | |
172 | } |