chacha/glide
1
0
Fork 0
Code Issues Pull Requests Actions Packages Releases Activity

lvalue cast fixes for gcc4

Browse Source
This commit is contained in:
jwrdegoede
2005-05-07 08:40:30 +00:00
parent 4a8fdd2725
commit 47daaa8aad
12 changed files with 118 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
glide3x/cvg/glide3/src/gaa.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1.8.1 2004/10/04 09:17:16 dborca
** killed some warnings / compilation errors
**
** Revision 1.1.1.1 1999/12/07 21:42:32 joseph
** Initial checkin into SourceForge.
**
@@ -572,7 +575,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
e = pointers;
if (mode)
e = *(float **)e;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
@@ -673,7 +676,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
if (mode)
e = *(float **)e;
oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
*oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
@@ -790,9 +793,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
/* draw from low Y to high Y */
if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) {
@@ -966,9 +969,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset);
owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
}
@@ -980,7 +983,7 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
}
@@ -1304,7 +1307,7 @@ _grAADrawTriangles(FxI32 mode, FxI32 ttype, FxI32 count, void *pointers)
b = *(float **)b;
c = *(float **)c;
}
(float *)pointers += stride*3;
pointers = (float *)pointers + stride*3;
/* move culling test to here */
{
@@ -1612,7 +1615,7 @@ _grAAVpDrawTriangles(FxI32 mode, FxI32 ttype, FxI32 count, void *pointers)
b = *(float **)b;
c = *(float **)c;
}
(float *)pointers += stride*3;
pointers = (float *)pointers + stride*3;
oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset);
@@ -1777,7 +1780,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mode, FxI32 count, void *pointers)
if (type == kSetupFan) {
v[0] = (mode == 0) ? pointers : *(float **)pointers;
while (sCount--) {
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (mode) {
v[1] = *(float **)pointers;
v[2] = *((float **)pointers+1);
@@ -1819,7 +1822,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mode, FxI32 count, void *pointers)
_grAADrawTriangles(1, type, 3, v);
else
_grAAVpDrawTriangles(1, type, 3, v);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
flip = ~flip;
}
flip = ~flip;

21
glide3x/cvg/glide3/src/gdraw.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1.8.1 2004/10/04 09:17:16 dborca
** killed some warnings / compilation errors
**
** Revision 1.1.1.1 1999/12/07 21:42:32 joseph
** Initial checkin into SourceForge.
**
@@ -457,7 +460,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, void *pointers)
vPtr = pointers;
if (mode) vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",
FARRAY(vPtr,gc->state.vData.vertexInfo.offset),
@@ -546,7 +549,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, void *pointers)
if (mode)
vPtr = *(float **)vPtr;
oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
{
FxU32 x, y;
@@ -666,9 +669,9 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
/*
** compute absolute deltas and draw from low Y to high Y
@@ -828,10 +831,10 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
}
else {
owa = oowa = oowb;
@@ -841,7 +844,7 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
}
fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
@@ -1008,7 +1011,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
i = gc->tsuDataList[dataElem];
@@ -1048,7 +1051,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_VP_SETFS(vPtr,oow);
}

13
glide3x/cvg/glide3/src/gstrip.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:42:33 joseph
** Initial checkin into SourceForge.
**
**
** 1 10/08/98 11:30a Brent
**
@@ -183,7 +186,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_SETF(FARRAY(vPtr, 0));
dataElem = 0;
@@ -212,7 +215,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_SETF(FARRAY(vPtr, 0));
dataElem = 0;
@@ -245,7 +248,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_SETF(FARRAY(vPtr, 0));
dataElem = 0;
@@ -311,7 +314,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (gc->state.vData.colorType == GR_U8) {
i = gc->tsuDataList[0];
TRI_SETF(FARRAY(vPtr, i));
@@ -347,7 +350,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_VP_SETFS(vPtr, oow);
#endif

5
glide3x/h3/glide3/src/distrip.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/11/24 21:44:54 joseph
** Initial checkin for SourceForge
**
**
** 4 4/06/99 3:54p Dow
** Alt tab again.
@@ -447,7 +450,7 @@ GR_DIENTRY(grDrawVertexArray, void , (FxU32 mode, FxU32 Count, void *pointers) )
else {
while ((int)Count >= 3) {
grDrawTriangle(*(float **)pointers, *((float **)pointers+1), *((float **)pointers+2));
(float *)pointers += 3;
pointers = (float *)pointers + 3;
Count -= 3;
}
}

25
glide3x/h3/glide3/src/gaa.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1.6.2 2004/10/08 06:18:50 dborca
** MSC doesn't like aliasing the stack
**
** Revision 1.1.1.1.6.1 2004/10/04 09:26:31 dborca
** DOS/OpenWatcom support
**
@@ -619,7 +622,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
e = pointers;
if (mode)
e = *(float **)e;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
@@ -720,7 +723,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
if (mode)
e = *(float **)e;
oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
*oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
@@ -842,9 +845,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
/* draw from low Y to high Y */
if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) {
@@ -1023,9 +1026,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset);
owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
}
@@ -1037,7 +1040,7 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
}
@@ -1371,7 +1374,7 @@ _grAADrawTriangles(FxI32 mode, FxI32 ttype, FxI32 count, void *pointers)
b = *(float **)b;
c = *(float **)c;
}
(float *)pointers += stride*3;
pointers = (float *)pointers + stride*3;
/* move culling test to here */
{
@@ -1545,7 +1548,7 @@ _grAAVpDrawTriangles(FxI32 mode, FxI32 ttype, FxI32 count, void *pointers)
b = *(float **)b;
c = *(float **)c;
}
(float *)pointers += stride*3;
pointers = (float *)pointers + stride*3;
oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset);
@@ -1710,7 +1713,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mode, FxI32 count, void *pointers)
if (type == kSetupFan) {
v[0] = (mode == 0) ? pointers : *(float **)pointers;
while (sCount--) {
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (mode) {
v[1] = *(float **)pointers;
v[2] = *((float **)pointers+1);
@@ -1752,7 +1755,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mode, FxI32 count, void *pointers)
_grAADrawTriangles(1, type, 3, v);
else
_grAAVpDrawTriangles(1, type, 3, v);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
flip = ~flip;
}
flip = ~flip;

21
glide3x/h3/glide3/src/gdraw.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.2.6.5 2004/10/07 07:16:38 dborca
** corrected grDrawTriangle on MSVC
**
** Revision 1.2.6.4 2004/10/05 14:47:15 dborca
** conditional compilation a bit more sane
**
@@ -415,7 +418,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, void *pointers)
vPtr = pointers;
if (mode) vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",
FARRAY(vPtr,gc->state.vData.vertexInfo.offset),
@@ -505,7 +508,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, void *pointers)
if (mode)
vPtr = *(float **)vPtr;
oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
{
FxU32 x, y;
@@ -627,9 +630,9 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
/*
** compute absolute deltas and draw from low Y to high Y
@@ -789,10 +792,10 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
}
else {
owa = oowa = oowb;
@@ -802,7 +805,7 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
}
fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
@@ -950,7 +953,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
i = gc->tsuDataList[dataElem];
@@ -990,7 +993,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_VP_SETFS(vPtr,oow);
}

7
glide3x/h3/glide3/src/gstrip.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/11/24 21:44:57 joseph
** Initial checkin for SourceForge
**
**
** 4 4/06/99 3:54p Dow
** Alt tab again.
@@ -185,7 +188,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_SETF(FARRAY(vPtr, 0));
dataElem = 0;
@@ -225,7 +228,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_VP_SETFS(vPtr, oow);
}

2
glide3x/h5/glide3/src/distrip.c
View File

@@ -458,7 +458,7 @@ GR_DIENTRY(grDrawVertexArray, void , (FxU32 mode, FxU32 Count, void *pointers) )
else {
while ((int)Count >= 3) {
grDrawTriangle(*(float **)pointers, *((float **)pointers+1), *((float **)pointers+2));
(float *)pointers += 3;
pointers = (float *)pointers + 3;
Count -= 3;
}
}

22
glide3x/h5/glide3/src/gaa.c
View File

@@ -628,7 +628,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
e = pointers;
if (mode)
e = *(float **)e;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
ptX = FARRAY(e, gc->state.vData.vertexInfo.offset);
ptY = FARRAY(e, gc->state.vData.vertexInfo.offset+4);
@@ -729,7 +729,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
if (mode)
e = *(float **)e;
oow = 1.0f / FARRAY(e, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
ptX = FARRAY(e, gc->state.vData.vertexInfo.offset)
*oow*gc->state.Viewport.hwidth+gc->state.Viewport.ox;
@@ -853,9 +853,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
/* draw from low Y to high Y */
if (FARRAY(v2, gc->state.vData.vertexInfo.offset+4) < FARRAY(v1, gc->state.vData.vertexInfo.offset+4)) {
@@ -1034,9 +1034,9 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owa = oowa = 1.0f / FARRAY(v1, gc->state.vData.wInfo.offset);
owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
}
@@ -1048,7 +1048,7 @@ _grAADrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
v1 = *(float **)v1;
v2 = *(float **)v2;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owb = oowb = 1.0f / FARRAY(v2, gc->state.vData.wInfo.offset);
}
@@ -1386,7 +1386,7 @@ _grAADrawTriangles(FxI32 mode, FxI32 ttype, FxI32 count, void *pointers)
b = *(float **)b;
c = *(float **)c;
}
(float *)pointers += stride*3;
pointers = (float *)pointers + stride*3;
/* move culling test to here */
{
@@ -1560,7 +1560,7 @@ _grAAVpDrawTriangles(FxI32 mode, FxI32 ttype, FxI32 count, void *pointers)
b = *(float **)b;
c = *(float **)c;
}
(float *)pointers += stride*3;
pointers = (float *)pointers + stride*3;
oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
oowc = 1.0f / FARRAY(c, gc->state.vData.wInfo.offset);
@@ -1725,7 +1725,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mode, FxI32 count, void *pointers)
if (type == kSetupFan) {
v[0] = (mode == 0) ? pointers : *(float **)pointers;
while (sCount--) {
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (mode) {
v[1] = *(float **)pointers;
v[2] = *((float **)pointers+1);
@@ -1767,7 +1767,7 @@ _grAADrawVertexList(FxU32 type, FxI32 mode, FxI32 count, void *pointers)
_grAADrawTriangles(1, type, 3, v);
else
_grAAVpDrawTriangles(1, type, 3, v);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
flip = ~flip;
}
flip = ~flip;

18
glide3x/h5/glide3/src/gdraw.c
View File

@@ -580,7 +580,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, void *pointers)
vPtr = pointers;
if (mode) vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
GDBG_INFO_MORE(gc->myLevel, "(%f %f)\n",
FARRAY(vPtr,gc->state.vData.vertexInfo.offset),
@@ -691,7 +691,7 @@ _grDrawPoints(FxI32 mode, FxI32 count, void *pointers)
if (mode)
vPtr = *(float **)vPtr;
oow = 1.0f / FARRAY(vPtr, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
{
float fx, fy;
@@ -825,9 +825,9 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
if (ltype == GR_LINES)
(float *)pointers += stride;
pointers = (float *)pointers + stride;
/*
** compute absolute deltas and draw from low Y to high Y
@@ -987,10 +987,10 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owa = oowa = 1.0f / FARRAY(a, gc->state.vData.wInfo.offset);
owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
}
else {
owa = oowa = oowb;
@@ -1000,7 +1000,7 @@ _grDrawLineStrip(FxI32 mode, FxI32 ltype, FxI32 count, void *pointers)
a = *(float **)a;
b = *(float **)b;
}
(float *)pointers += stride;
pointers = (float *)pointers + stride;
owb = oowb = 1.0f / FARRAY(b, gc->state.vData.wInfo.offset);
}
fay = tmp1 = FARRAY(a, gc->state.vData.vertexInfo.offset+4)
@@ -1147,7 +1147,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
i = gc->tsuDataList[dataElem];
@@ -1187,7 +1187,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_VP_SETFS(vPtr,oow);
}

45
glide3x/h5/glide3/src/glfb.c
View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.7.4.19 2004/10/05 14:54:43 dborca
** DOS/OpenWatcom woes
**
** Revision 1.7.4.18 2004/04/28 17:40:51 koolsmoky
** Removed registry path from GETENV.
** Removed FX_GLIDE_AA_PIXELCENTER, FX_GLIDE_AA_JITTERDISP, FX_GLIDE_AA_GRIDROTATION, and FX_GLIDE_FORCE_SST0.
@@ -2266,8 +2269,8 @@ _grLfbWriteRegion(FxBool pixPipelineP,
do {
MMX_DSTLINE2(srcData, dstData, src_width);
/* adjust for next line */
((FxU8 *)srcData) += src_stride;
((FxU8 *)dstData) += info.strideInBytes;
srcData = (FxU32 *)((FxU8 *)srcData + src_stride);
dstData = (FxU32 *)((FxU8 *)dstData + info.strideInBytes);
} while (--scanline);
MMX_RESET();
break;
@@ -2275,8 +2278,8 @@ _grLfbWriteRegion(FxBool pixPipelineP,
do {
FPU_DSTLINE2(srcData, dstData, src_width);
/* adjust for next line */
((FxU8 *)srcData) += src_stride;
((FxU8 *)dstData) += info.strideInBytes;
srcData = (FxU32 *)((FxU8 *)srcData + src_stride);
dstData = (FxU32 *)((FxU8 *)dstData + info.strideInBytes);
} while (--scanline);
break;
}
@@ -2346,8 +2349,8 @@ _grLfbWriteRegion(FxBool pixPipelineP,
do {
MMX_DSTLINE4(srcData, dstData, src_width);
/* adjust for next line */
((FxU8 *)srcData) += src_stride;
((FxU8 *)dstData) += info.strideInBytes;
srcData = (FxU32 *)((FxU8 *)srcData + src_stride);
dstData = (FxU32 *)((FxU8 *)dstData + info.strideInBytes);
} while (--scanline);
MMX_RESET();
break;
@@ -2355,8 +2358,8 @@ _grLfbWriteRegion(FxBool pixPipelineP,
do {
FPU_DSTLINE4(srcData, dstData, src_width);
/* adjust for next line */
((FxU8 *)srcData) += src_stride;
((FxU8 *)dstData) += info.strideInBytes;
srcData = (FxU32 *)((FxU8 *)srcData + src_stride);
dstData = (FxU32 *)((FxU8 *)dstData + info.strideInBytes);
} while (--scanline);
break;
}
@@ -2522,16 +2525,16 @@ static FxBool grLfbReadRegionOrigin (GrBuffer_t src_buffer, GrOriginLocation_t o
do {
MMX_SRCLINE(src, dst_data, len);
/* adjust for next line */
((FxU8 *)src) += info.strideInBytes;
((FxU8 *)dst_data) += dst_stride;
src = (FxU32 *)((FxU8 *)src + info.strideInBytes);
dst_data = (FxU32 *)((FxU8 *)dst_data + dst_stride);
} while (--src_height);
MMX_RESET();
} else {
do {
FPU_SRCLINE(src, dst_data, len);
/* adjust for next line */
((FxU8 *)src) += info.strideInBytes;
((FxU8 *)dst_data) += dst_stride;
src = (FxU32 *)((FxU8 *)src + info.strideInBytes);
dst_data = (FxU32 *)((FxU8 *)dst_data + dst_stride);
} while (--src_height);
}
goto okay;
@@ -2553,7 +2556,11 @@ static FxBool grLfbReadRegionOrigin (GrBuffer_t src_buffer, GrOriginLocation_t o
while(src_height--) {
/* adjust starting alignment */
if (((FxU32)src)&3) {
*((FxU16 *)dst)++=*((FxU16 *)src)++;
/* Old code: *((FxU16 *)dst)++ = *((FxU16 *)src)++; */
FxU16 *p = (FxU16 *)dst;
*p = *((FxU16 *)src);
dst = (FxU32 *)((FxU16 *)dst + 1);
src = (FxU32 *)((FxU16 *)src + 1);
}
/* read in dwords of pixels */
@@ -2572,8 +2579,8 @@ static FxBool grLfbReadRegionOrigin (GrBuffer_t src_buffer, GrOriginLocation_t o
}
}
/* adjust for next line */
((FxU8 *)src)+=src_adjust;
((FxU8 *)dst)+=dst_adjust;
src = (FxU32 *)((FxU8 *)src + src_adjust);
dst = (FxU32 *)((FxU8 *)dst + dst_adjust);
}
}
#endif
@@ -2598,8 +2605,8 @@ static FxBool grLfbReadRegionOrigin (GrBuffer_t src_buffer, GrOriginLocation_t o
}
/* adjust for next line */
((FxU8 *)src)+=info.strideInBytes;
((FxU8 *)dst_data) += dst_stride;
src = (FxU32 *)((FxU8 *)src + info.strideInBytes);
dst_data = (FxU32 *)((FxU8 *)dst_data + dst_stride);
}
} else if (gc->state.forced32BPP == 15) {
while(src_height--) {
@@ -2620,8 +2627,8 @@ static FxBool grLfbReadRegionOrigin (GrBuffer_t src_buffer, GrOriginLocation_t o
}
/* adjust for next line */
((FxU8 *)src)+=info.strideInBytes;
((FxU8 *)dst_data) += dst_stride;
src = (FxU32 *)((FxU8 *)src + info.strideInBytes);
dst_data = (FxU32 *)((FxU8 *)dst_data + dst_stride);
}
}

4
glide3x/h5/glide3/src/gstrip.c
View File

@@ -212,7 +212,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
vPtr = pointers;
if (mode)
vPtr = *(float **)vPtr;
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_SETF(FARRAY(vPtr, 0));
dataElem = 0;
@@ -252,7 +252,7 @@ _grDrawVertexList(FxU32 pktype, FxU32 type, FxI32 mode, FxI32 count, void *point
*oow*gc->state.Viewport.hwidth + gc->state.Viewport.ox);
TRI_SETF(FARRAY(vPtr, 4)
*oow*gc->state.Viewport.hheight + gc->state.Viewport.oy);
(float *)pointers += stride;
pointers = (float *)pointers + stride;
TRI_VP_SETFS(vPtr, oow);
}