ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Glitch64: Update some code to reduce warning on level 4

This commit is contained in:
zilmar 2013-04-15 13:51:39 +10:00
parent dcf9762fb2
commit d6a148696c
4 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Glide64/Gfx #1.3.h
View File

@ -252,9 +252,9 @@ extern std::ofstream rdp_err;
#define RDP_E(x)
#endif
#ifdef RDP_LOGGING
__inline void FRDP (const char *fmt, ...)
{
#ifdef RDP_LOGGING
if (!settings.logging || !log_open) return;
#ifdef LOGNOTKEY
@ -266,11 +266,14 @@ __inline void FRDP (const char *fmt, ...)
vsprintf(out_buf, fmt, ap);
LRDP (out_buf);
va_end(ap);
#endif
}
#else
__inline void FRDP (const char * /*fmt*/, ...) {}
#endif
#ifdef RDP_ERROR_LOG
__inline void FRDP_E (const char *fmt, ...)
{
#ifdef RDP_ERROR_LOG
if (!settings.elogging || !elog_open) return;
#ifdef LOGNOTKEY
@ -286,8 +289,10 @@ __inline void FRDP_E (const char *fmt, ...)
rdp_err << out_buf;
rdp_err.flush();
va_end(ap2);
#endif
}
#else
__inline void FRDP_E (const char * /*fmt*/, ...) {}
#endif
extern int fullscreen;
extern int romopen;

4
Source/Glitch64/combiner.cpp
View File

@ -1540,7 +1540,7 @@ guFogTableIndexToW( int i )
}
FX_ENTRY void FX_CALL
guFogGenerateLinear(GrFog_t *fogtable,
guFogGenerateLinear(GrFog_t * /*fogtable*/,
float nearZ, float farZ )
{
LOG("guFogGenerateLinear(%f,%f)\r\n", nearZ, farZ);
@ -1551,7 +1551,7 @@ guFogGenerateLinear(GrFog_t *fogtable,
}
FX_ENTRY void FX_CALL
grFogTable( const GrFog_t ft[] )
grFogTable( const GrFog_t /*ft */ [] )
{
LOG("grFogTable()\r\n");
}

2
Source/Glitch64/geometry.cpp
View File

@ -222,7 +222,7 @@ FX_ENTRY void FX_CALL
grDepthMask( FxBool mask )
{
LOG("grDepthMask(%d)\r\n", mask);
glDepthMask(mask);
glDepthMask((GLboolean)mask);
}
float biasFactor = 0;

69
Source/Glitch64/main.cpp
View File

@ -518,7 +518,7 @@ FX_ENTRY void FX_CALL
grColorMask( FxBool rgb, FxBool a )
{
LOG("grColorMask(%d, %d)\r\n", rgb, a);
glColorMask(rgb, rgb, rgb, a);
glColorMask((GLboolean)rgb, (GLboolean)rgb, (GLboolean)rgb, (GLboolean)a);
}
FX_ENTRY void FX_CALL
@ -604,7 +604,7 @@ grSstWinOpenExt(
GrScreenRefresh_t refresh_rate,
GrColorFormat_t color_format,
GrOriginLocation_t origin_location,
GrPixelFormat_t pixelformat,
GrPixelFormat_t /*pixelformat*/,
int nColBuffers,
int nAuxBuffers)
{
@ -1166,7 +1166,10 @@ grGlideShutdown( void )
FX_ENTRY FxBool FX_CALL
grSstWinClose( GrContext_t context )
{
int i, clear_texbuff = use_fbo;
int i;
#ifndef WIN32
int clear_texbuff = use_fbo;
#endif
LOG("grSstWinClose(%d)\r\n", context);
for (i=0; i<2; i++) {
@ -2605,16 +2608,16 @@ grTexDownloadTable( GrTexTable_t type,
}
FX_ENTRY FxBool FX_CALL
grTexDownloadMipMapLevelPartial( GrChipID_t tmu,
FxU32 startAddress,
GrLOD_t thisLod,
GrLOD_t largeLod,
GrAspectRatio_t aspectRatio,
GrTextureFormat_t format,
FxU32 evenOdd,
void *data,
int start,
int end )
grTexDownloadMipMapLevelPartial( GrChipID_t /*tmu*/,
FxU32 /*startAddress*/,
GrLOD_t /*thisLod*/,
GrLOD_t /*largeLod*/,
GrAspectRatio_t /*aspectRatio*/,
GrTextureFormat_t /*format*/,
FxU32 /*evenOdd*/,
void * /*data*/,
int /*start*/,
int /*end*/ )
{
display_warning("grTexDownloadMipMapLevelPartial");
return 1;
@ -2666,51 +2669,51 @@ grSelectContext( GrContext_t context )
FX_ENTRY void FX_CALL
grAADrawTriangle(
const void *a, const void *b, const void *c,
FxBool ab_antialias, FxBool bc_antialias, FxBool ca_antialias
const void * /*a*/, const void * /*b*/, const void * /*c*/,
FxBool /*ab_antialias*/, FxBool /*bc_antialias*/, FxBool /*ca_antialias*/
)
{
display_warning("grAADrawTriangle");
}
FX_ENTRY void FX_CALL
grAlphaControlsITRGBLighting( FxBool enable )
grAlphaControlsITRGBLighting( FxBool /*enable*/ )
{
display_warning("grAlphaControlsITRGBLighting");
}
FX_ENTRY void FX_CALL
grGlideSetVertexLayout( const void *layout )
grGlideSetVertexLayout( const void * /*layout*/ )
{
display_warning("grGlideSetVertexLayout");
}
FX_ENTRY void FX_CALL
grGlideGetVertexLayout( void *layout )
grGlideGetVertexLayout( void * /*layout*/ )
{
display_warning("grGlideGetVertexLayout");
}
FX_ENTRY void FX_CALL
grGlideSetState( const void *state )
grGlideSetState( const void * /*state*/ )
{
display_warning("grGlideSetState");
}
FX_ENTRY void FX_CALL
grGlideGetState( void *state )
grGlideGetState( void * /*state*/ )
{
display_warning("grGlideGetState");
}
FX_ENTRY void FX_CALL
grLfbWriteColorFormat(GrColorFormat_t colorFormat)
grLfbWriteColorFormat(GrColorFormat_t /*colorFormat*/)
{
display_warning("grLfbWriteColorFormat");
}
FX_ENTRY void FX_CALL
grLfbWriteColorSwizzle(FxBool swizzleBytes, FxBool swapWords)
grLfbWriteColorSwizzle(FxBool /*swizzleBytes*/, FxBool /*swapWords*/)
{
display_warning("grLfbWriteColorSwizzle");
}
@ -2728,11 +2731,11 @@ grLfbConstantAlpha( GrAlpha_t alpha )
}
FX_ENTRY void FX_CALL
grTexMultibaseAddress( GrChipID_t tmu,
GrTexBaseRange_t range,
FxU32 startAddress,
FxU32 evenOdd,
GrTexInfo *info )
grTexMultibaseAddress( GrChipID_t /*tmu*/,
GrTexBaseRange_t /*range*/,
FxU32 /*startAddress*/,
FxU32 /*evenOdd*/,
GrTexInfo * /*info*/ )
{
display_warning("grTexMultibaseAddress");
}
@ -2766,7 +2769,7 @@ static void CorrectGamma(const FxU16 aGammaRamp[3][256])
#endif
FX_ENTRY void FX_CALL
grLoadGammaTable( FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)
grLoadGammaTable( FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue)
{
LOG("grLoadGammaTable\r\n");
if (!fullscreen)
@ -2783,7 +2786,7 @@ grLoadGammaTable( FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)
}
FX_ENTRY void FX_CALL
grGetGammaTableExt(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue)
grGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue)
{
LOG("grGetGammaTableExt()\r\n");
FxU16 aGammaRamp[3][256];
@ -2829,22 +2832,22 @@ grDitherMode( GrDitherMode_t mode )
display_warning("grDitherMode");
}
void grChromaRangeExt(GrColor_t color0, GrColor_t color1, FxU32 mode)
void grChromaRangeExt(GrColor_t /*color0*/, GrColor_t /*color1*/, FxU32 /*mode*/)
{
display_warning("grChromaRangeExt");
}
void grChromaRangeModeExt(GrChromakeyMode_t mode)
void grChromaRangeModeExt(GrChromakeyMode_t /*mode*/)
{
display_warning("grChromaRangeModeExt");
}
void grTexChromaRangeExt(GrChipID_t tmu, GrColor_t color0, GrColor_t color1, GrTexChromakeyMode_t mode)
void grTexChromaRangeExt(GrChipID_t /*tmu*/, GrColor_t /*color0*/, GrColor_t /*color1*/, GrTexChromakeyMode_t /*mode*/)
{
display_warning("grTexChromaRangeExt");
}
void grTexChromaModeExt(GrChipID_t tmu, GrChromakeyMode_t mode)
void grTexChromaModeExt(GrChipID_t /*tmu*/, GrChromakeyMode_t /*mode*/)
{
display_warning("grTexChromaRangeModeExt");
}