killed some warnings / compilation errors

This commit is contained in:
dborca
2004-10-04 09:17:16 +00:00
parent 22d4f642cb
commit 5d59cd4e2f
4 changed files with 19 additions and 10 deletions

View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:42:30 joseph
** Initial checkin into SourceForge.
**
**
** 1 10/08/98 11:30a Brent
**
@@ -65,6 +68,8 @@
#include <string.h>
#include <3dfx.h>
#define FX_DLL_DEFINITION
#include <fxdll.h>
#include <glide.h>
#include "fxglide.h"

View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1.8.2 2004/01/20 14:04:10 dborca
** compilation and some other minor fixes to aid in debugging
**
** Revision 1.1.1.1.8.1 2003/11/03 13:34:29 dborca
** Voodoo2 happiness (DJGPP & Linux)
**
@@ -73,9 +76,7 @@
*/
#include <stdio.h>
#include <string.h>
#ifdef __GNUC__
#include <ctype.h>
#endif
#include <3dfx.h>
#define FX_DLL_DEFINITION

View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:42:32 joseph
** Initial checkin into SourceForge.
**
**
** 1 10/08/98 11:30a Brent
**
@@ -455,7 +458,7 @@ GR_ENTRY(grAADrawTriangle,
if ((gc->state.cull_mode != GR_CULL_DISABLE) && (((FxI32)(j ^ (gc->state.cull_mode << 31UL))) >= 0))
return;
}
(*gc->curArchProcs.drawTrianglesProc)(GR_VTX_PTR_ARRAY, 3, &a);
(*gc->curArchProcs.drawTrianglesProc)(GR_VTX_PTR_ARRAY, 3, (void *)&a);
/* Disable depth buffer writes for edge triangles */
fbzMode = fbzModeOld;
@@ -537,7 +540,7 @@ _grAADrawPoints(FxI32 mode, FxI32 count, void *pointers)
FxI32 stride = mode;
FxU32 tmp_cullStripHdr;
GDBG_INFO(94,"_grAADrawPoints(0x%x)\n",e);
GDBG_INFO(94,"_grAADrawPoints(0x%x)\n",pointers);
GDBG_INFO_MORE(gc->myLevel, "(count = %d, pointers = 0x%x)\n",
count, pointers);

View File

@@ -19,6 +19,9 @@
**
** $Header$
** $Log$
** Revision 1.1.1.1 1999/12/07 21:42:32 joseph
** Initial checkin into SourceForge.
**
**
** 1 10/08/98 11:30a Brent
**
@@ -214,9 +217,9 @@ GR_ENTRY(grDrawLine, void, (const void *a, const void *b))
GR_FLUSH_STATE();
if (gc->state.grEnableArgs.primitive_smooth_mode & GR_AA_ORDERED_LINES_MASK)
_grAADrawLineStrip(GR_VTX_PTR_ARRAY, GR_LINES, 2, &a);
_grAADrawLineStrip(GR_VTX_PTR_ARRAY, GR_LINES, 2, (void *)&a);
else
_grDrawLineStrip(GR_VTX_PTR_ARRAY, GR_LINES, 2, &a);
_grDrawLineStrip(GR_VTX_PTR_ARRAY, GR_LINES, 2, (void *)&a);
#undef FN_NAME
} /* grDrawLine */
@@ -956,9 +959,6 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
#define FN_NAME "_grDrawTriangles_Default"
FxI32
#ifdef GLIDE_DEBUG
vSize,
#endif
k;
FxI32 stride = mode;
float *vPtr;
@@ -971,7 +971,7 @@ _grDrawTriangles_Default(FxI32 mode, FxI32 count, void *pointers)
GR_FLUSH_STATE();
#ifdef GLIDE_DEBUG
GDBG_INFO(110, "%s: vSize = %d\n", FN_NAME, vSize);
GDBG_INFO(110, "%s: vSize = %d\n", FN_NAME, gc->state.vData.vSize);
GDBG_INFO(110, "%s: paramMask = 0x%x\n", FN_NAME, gc->cmdTransportInfo.paramMask);
#endif