Glitch64: Fix up warnings related to warning level 4

This commit is contained in:
zilmar 2013-04-22 07:35:30 +10:00
parent 8f16f58311
commit 11c7373b3a
3 changed files with 32 additions and 33 deletions

View File

@ -1869,7 +1869,7 @@ void updateTexture()
} }
} }
FX_ENTRY void FX_CALL grFramebufferCopyExt(int x, int y, int w, int h, FX_ENTRY void FX_CALL grFramebufferCopyExt(int /*x*/, int /*y*/, int /*w*/, int /*h*/,
int from, int to, int mode) int from, int to, int mode)
{ {
if (mode == GR_FBCOPY_MODE_DEPTH) { if (mode == GR_FBCOPY_MODE_DEPTH) {
@ -1922,7 +1922,7 @@ grRenderBuffer( GrBuffer_t buffer )
{ {
#ifdef _WIN32 #ifdef _WIN32
static HANDLE region = NULL; static HANDLE region = NULL;
int realWidth = pBufferWidth, realHeight = pBufferHeight; //int realWidth = pBufferWidth, realHeight = pBufferHeight;
#endif // _WIN32 #endif // _WIN32
LOG("grRenderBuffer(%d)\r\n", buffer); LOG("grRenderBuffer(%d)\r\n", buffer);
//printf("grRenderBuffer(%d)\n", buffer); //printf("grRenderBuffer(%d)\n", buffer);
@ -2530,7 +2530,7 @@ grQueryResolutions( const GrResolution *resTemplate, GrResolution *output )
} }
FX_ENTRY FxBool FX_CALL FX_ENTRY FxBool FX_CALL
grReset( FxU32 what ) grReset( FxU32 /*what*/ )
{ {
display_warning("grReset"); display_warning("grReset");
return 1; return 1;
@ -2559,7 +2559,7 @@ grDisableAllEffects( void )
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grErrorSetCallback( GrErrorCallbackFnc_t fnc ) grErrorSetCallback( GrErrorCallbackFnc_t /*fnc*/ )
{ {
display_warning("grErrorSetCallback"); display_warning("grErrorSetCallback");
} }
@ -2577,32 +2577,32 @@ grFlush(void)
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grTexMultibase( GrChipID_t tmu, grTexMultibase( GrChipID_t /*tmu*/,
FxBool enable ) FxBool /*enable*/ )
{ {
display_warning("grTexMultibase"); display_warning("grTexMultibase");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grTexMipMapMode( GrChipID_t tmu, grTexMipMapMode( GrChipID_t /*tmu*/,
GrMipMapMode_t mode, GrMipMapMode_t /*mode*/,
FxBool lodBlend ) FxBool /*lodBlend*/ )
{ {
display_warning("grTexMipMapMode"); display_warning("grTexMipMapMode");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grTexDownloadTablePartial( GrTexTable_t type, grTexDownloadTablePartial( GrTexTable_t /*type*/,
void *data, void * /*data*/,
int start, int /*start*/,
int end ) int /*end*/)
{ {
display_warning("grTexDownloadTablePartial"); display_warning("grTexDownloadTablePartial");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grTexDownloadTable( GrTexTable_t type, grTexDownloadTable( GrTexTable_t /*type*/,
void *data ) void * /*data*/)
{ {
display_warning("grTexDownloadTable"); display_warning("grTexDownloadTable");
} }
@ -2624,44 +2624,44 @@ grTexDownloadMipMapLevelPartial( GrChipID_t /*tmu*/,
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grTexDownloadMipMapLevel( GrChipID_t tmu, grTexDownloadMipMapLevel( GrChipID_t /*tmu*/,
FxU32 startAddress, FxU32 /*startAddress*/,
GrLOD_t thisLod, GrLOD_t /*thisLod*/,
GrLOD_t largeLod, GrLOD_t /*largeLod*/,
GrAspectRatio_t aspectRatio, GrAspectRatio_t /*aspectRatio*/,
GrTextureFormat_t format, GrTextureFormat_t /*format*/,
FxU32 evenOdd, FxU32 /*evenOdd*/,
void *data ) void * /*data*/ )
{ {
display_warning("grTexDownloadMipMapLevel"); display_warning("grTexDownloadMipMapLevel");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grTexNCCTable( GrNCCTable_t table ) grTexNCCTable( GrNCCTable_t /*table*/ )
{ {
display_warning("grTexNCCTable"); display_warning("grTexNCCTable");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grViewport( FxI32 x, FxI32 y, FxI32 width, FxI32 height ) grViewport( FxI32 /*x*/, FxI32 /*y*/, FxI32 /*width*/, FxI32 /*height*/ )
{ {
display_warning("grViewport"); display_warning("grViewport");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grDepthRange( FxFloat n, FxFloat f ) grDepthRange( FxFloat /*n*/, FxFloat /*f*/ )
{ {
display_warning("grDepthRange"); display_warning("grDepthRange");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grSplash(float x, float y, float width, float height, FxU32 frame) grSplash(float /*x*/, float /*y*/, float /*width*/, float /*height*/, FxU32 /*frame*/)
{ {
display_warning("grSplash"); display_warning("grSplash");
} }
FX_ENTRY FxBool FX_CALL FX_ENTRY FxBool FX_CALL
grSelectContext( GrContext_t context ) grSelectContext( GrContext_t /*context*/ )
{ {
display_warning("grSelectContext"); display_warning("grSelectContext");
return 1; return 1;
@ -2719,13 +2719,13 @@ grLfbWriteColorSwizzle(FxBool /*swizzleBytes*/, FxBool /*swapWords*/)
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grLfbConstantDepth( FxU32 depth ) grLfbConstantDepth( FxU32 /*depth*/ )
{ {
display_warning("grLfbConstantDepth"); display_warning("grLfbConstantDepth");
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grLfbConstantAlpha( GrAlpha_t alpha ) grLfbConstantAlpha( GrAlpha_t /*alpha*/ )
{ {
display_warning("grLfbConstantAlpha"); display_warning("grLfbConstantAlpha");
} }
@ -2827,7 +2827,7 @@ guGammaCorrectionRGB( FxFloat gammaR, FxFloat gammaG, FxFloat gammaB )
} }
FX_ENTRY void FX_CALL FX_ENTRY void FX_CALL
grDitherMode( GrDitherMode_t mode ) grDitherMode( GrDitherMode_t /*mode*/ )
{ {
display_warning("grDitherMode"); display_warning("grDitherMode");
} }

View File

@ -391,7 +391,7 @@ grTexDownloadMipMap( GrChipID_t tmu,
int width, height, i, j; int width, height, i, j;
int factor; int factor;
int glformat = 0; int glformat = 0;
int gltexfmt, glpixfmt, glpackfmt; int gltexfmt = 0, glpixfmt = 0, glpackfmt = 0;
LOG("grTexDownloadMipMap(%d,%d,%d)\r\n", tmu, startAddress, evenOdd); LOG("grTexDownloadMipMap(%d,%d,%d)\r\n", tmu, startAddress, evenOdd);
if (info->largeLodLog2 != info->smallLodLog2) display_warning("grTexDownloadMipMap : loading more than one LOD"); if (info->largeLodLog2 != info->smallLodLog2) display_warning("grTexDownloadMipMap : loading more than one LOD");

View File

@ -6,7 +6,6 @@
#include "dxdiag.h" #include "dxdiag.h"
#include "main.h" #include "main.h"
#pragma comment(lib, "ole32.lib") #pragma comment(lib, "ole32.lib")
//#pragma comment(lib, "dxguid.lib")
#define SAFE_RELEASE(x) { if (x != NULL) { x->Release(); x = NULL; } } #define SAFE_RELEASE(x) { if (x != NULL) { x->Release(); x = NULL; } }
IDxDiagProvider* Provider; IDxDiagProvider* Provider;