From c34739d5285627b022d304238828a2a1e797bf26 Mon Sep 17 00:00:00 2001 From: zilmar Date: Mon, 22 May 2017 17:54:56 +1000 Subject: [PATCH] [Video] Remove unused functions --- .../Renderer/OGLESglitchmain.cpp | 272 ----------------- .../Renderer/OGLglitchmain.cpp | 275 ------------------ 2 files changed, 547 deletions(-) diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index 52923a208..f24746cb2 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -1785,18 +1785,6 @@ grLfbWriteRegion(GrBuffer_t dst_buffer, /* wrapper-specific glide extensions */ -FX_ENTRY char ** FX_CALL -grQueryResolutionsExt(int32_t * Size) -{ - WriteTrace(TraceGlitch, TraceDebug, "-"); - return 0; -} - -FX_ENTRY FxBool FX_CALL grKeyPressedExt(FxU32 key) -{ - return 0; -} - void grConfigWrapperExt(FxI32 vram, FxBool fbo, FxBool aniso) { WriteTrace(TraceGlitch, TraceDebug, "-"); @@ -1805,44 +1793,6 @@ void grConfigWrapperExt(FxI32 vram, FxBool fbo, FxBool aniso) config.anisofilter = aniso; } -// unused by glide64 - -FX_ENTRY FxI32 FX_CALL -grQueryResolutions(const GrResolution *resTemplate, GrResolution *output) -{ - int res_inf = 0; - int res_sup = 0xf; - int i; - int n = 0; - WriteTrace(TraceGlitch, TraceDebug, "-"); - WriteTrace(TraceGlitch, TraceWarning, "grQueryResolutions"); - if ((unsigned int)resTemplate->resolution != GR_QUERY_ANY) - { - res_inf = res_sup = resTemplate->resolution; - } - if ((unsigned int)resTemplate->refresh == GR_QUERY_ANY) WriteTrace(TraceGlitch, TraceWarning, "querying any refresh rate"); - if ((unsigned int)resTemplate->numAuxBuffers == GR_QUERY_ANY) WriteTrace(TraceGlitch, TraceWarning, "querying any numAuxBuffers"); - if ((unsigned int)resTemplate->numColorBuffers == GR_QUERY_ANY) WriteTrace(TraceGlitch, TraceWarning, "querying any numColorBuffers"); - - if (output == NULL) return res_sup - res_inf + 1; - for (i = res_inf; i <= res_sup; i++) - { - output[n].resolution = i; - output[n].refresh = resTemplate->refresh; - output[n].numAuxBuffers = resTemplate->numAuxBuffers; - output[n].numColorBuffers = resTemplate->numColorBuffers; - n++; - } - return res_sup - res_inf + 1; -} - -FX_ENTRY FxBool FX_CALL -grReset(FxU32 what) -{ - WriteTrace(TraceGlitch, TraceWarning, "grReset"); - return 1; -} - FX_ENTRY void FX_CALL grEnable(GrEnableMode_t mode) { @@ -1851,202 +1801,6 @@ grEnable(GrEnableMode_t mode) UMAmode = 1; } -FX_ENTRY void FX_CALL -grDisable(GrEnableMode_t mode) -{ - WriteTrace(TraceGlitch, TraceDebug, "-"); - if (mode == GR_TEXTURE_UMA_EXT) - UMAmode = 0; -} - -FX_ENTRY void FX_CALL -grDisableAllEffects(void) -{ - WriteTrace(TraceGlitch, TraceWarning, "grDisableAllEffects"); -} - -FX_ENTRY void FX_CALL -grErrorSetCallback(GrErrorCallbackFnc_t fnc) -{ - WriteTrace(TraceGlitch, TraceWarning, "grErrorSetCallback"); -} - -FX_ENTRY void FX_CALL -grFinish(void) -{ - WriteTrace(TraceGlitch, TraceWarning, "grFinish"); -} - -FX_ENTRY void FX_CALL -grFlush(void) -{ - WriteTrace(TraceGlitch, TraceWarning, "grFlush"); -} - -FX_ENTRY void FX_CALL -grTexMultibase(GrChipID_t tmu, - FxBool enable) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexMultibase"); -} - -FX_ENTRY void FX_CALL -grTexMipMapMode(GrChipID_t tmu, - GrMipMapMode_t mode, - FxBool lodBlend) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexMipMapMode"); -} - -FX_ENTRY void FX_CALL -grTexDownloadTablePartial(GrTexTable_t type, - void *data, - int start, - int end) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadTablePartial"); -} - -FX_ENTRY void FX_CALL -grTexDownloadTable(GrTexTable_t type, - void *data) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadTable"); -} - -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) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadMipMapLevelPartial"); - return 1; -} - -FX_ENTRY void FX_CALL -grTexDownloadMipMapLevel(GrChipID_t tmu, - FxU32 startAddress, - GrLOD_t thisLod, - GrLOD_t largeLod, - GrAspectRatio_t aspectRatio, - GrTextureFormat_t format, - FxU32 evenOdd, - void *data) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadMipMapLevel"); -} - -FX_ENTRY void FX_CALL -grTexNCCTable(GrNCCTable_t table) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexNCCTable"); -} - -FX_ENTRY void FX_CALL -grViewport(FxI32 x, FxI32 y, FxI32 width, FxI32 height) -{ - WriteTrace(TraceGlitch, TraceWarning, "grViewport"); -} - -FX_ENTRY void FX_CALL -grDepthRange(FxFloat n, FxFloat f) -{ - WriteTrace(TraceGlitch, TraceWarning, "grDepthRange"); -} - -FX_ENTRY void FX_CALL -grSplash(float x, float y, float width, float height, FxU32 frame) -{ - WriteTrace(TraceGlitch, TraceWarning, "grSplash"); -} - -FX_ENTRY FxBool FX_CALL -grSelectContext(GrContext_t context) -{ - WriteTrace(TraceGlitch, TraceWarning, "grSelectContext"); - return 1; -} - -FX_ENTRY void FX_CALL -grAADrawTriangle( - const void *a, const void *b, const void *c, - FxBool ab_antialias, FxBool bc_antialias, FxBool ca_antialias -) -{ - WriteTrace(TraceGlitch, TraceWarning, "grAADrawTriangle"); -} - -FX_ENTRY void FX_CALL -grAlphaControlsITRGBLighting(FxBool enable) -{ - WriteTrace(TraceGlitch, TraceWarning, "grAlphaControlsITRGBLighting"); -} - -FX_ENTRY void FX_CALL -grGlideSetVertexLayout(const void *layout) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideSetVertexLayout"); -} - -FX_ENTRY void FX_CALL -grGlideGetVertexLayout(void *layout) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideGetVertexLayout"); -} - -FX_ENTRY void FX_CALL -grGlideSetState(const void *state) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideSetState"); -} - -FX_ENTRY void FX_CALL -grGlideGetState(void *state) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideGetState"); -} - -FX_ENTRY void FX_CALL -grLfbWriteColorFormat(GrColorFormat_t colorFormat) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbWriteColorFormat"); -} - -FX_ENTRY void FX_CALL -grLfbWriteColorSwizzle(FxBool swizzleBytes, FxBool swapWords) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbWriteColorSwizzle"); -} - -FX_ENTRY void FX_CALL -grLfbConstantDepth(FxU32 depth) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbConstantDepth"); -} - -FX_ENTRY void FX_CALL -grLfbConstantAlpha(gfxAlpha_t alpha) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbConstantAlpha"); -} - -FX_ENTRY void FX_CALL -grTexMultibaseAddress(GrChipID_t tmu, - GrTexBaseRange_t range, - FxU32 startAddress, - FxU32 evenOdd, - GrTexInfo *info) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexMultibaseAddress"); -} - FX_ENTRY void FX_CALL grLoadGammaTable(FxU32 nentries, FxU32 *red, FxU32 *green, FxU32 *blue) { @@ -2099,32 +1853,6 @@ guGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB) CorrectGamma(aGammaRamp);*/ } -FX_ENTRY void FX_CALL -grDitherMode(GrDitherMode_t mode) -{ - WriteTrace(TraceGlitch, TraceWarning, "grDitherMode"); -} - -void grChromaRangeExt(GrColor_t color0, GrColor_t color1, FxU32 mode) -{ - WriteTrace(TraceGlitch, TraceWarning, "grChromaRangeExt"); -} - -void grChromaRangeModeExt(GrChromakeyMode_t mode) -{ - WriteTrace(TraceGlitch, TraceWarning, "grChromaRangeModeExt"); -} - -void grTexChromaRangeExt(GrChipID_t tmu, GrColor_t color0, GrColor_t color1, GrTexChromakeyMode_t mode) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexChromaRangeExt"); -} - -void grTexChromaModeExt(GrChipID_t tmu, GrChromakeyMode_t mode) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexChromaRangeModeExt"); -} - // VP debug #ifdef VPDEBUG int dumping = 0; diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 7c6f8809c..a9de669c8 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -1718,10 +1718,6 @@ grBufferSwap(FxU32 swap_interval) for (i = 0; i < nb_fb; i++) fbs[i].buff_clear = 1; -#ifdef _DEBUG - grFinish(); -#endif - // VP debugging } @@ -2039,15 +2035,6 @@ grLfbWriteRegion(GrBuffer_t dst_buffer, /* wrapper-specific glide extensions */ -FX_ENTRY FxBool FX_CALL grKeyPressedExt(FxU32 key) -{ -#ifdef _WIN32 - return (GetAsyncKeyState(key) & 0x8000); -#else - return 0; -#endif -} - void grConfigWrapperExt(FxI32 vram, FxBool fbo, FxBool aniso) { WriteTrace(TraceGlitch, TraceDebug, "-"); @@ -2056,44 +2043,6 @@ void grConfigWrapperExt(FxI32 vram, FxBool fbo, FxBool aniso) config.anisofilter = aniso; } -// unused by glide64 - -FX_ENTRY FxI32 FX_CALL -grQueryResolutions(const GrResolution *resTemplate, GrResolution *output) -{ - int res_inf = 0; - int res_sup = 0xf; - int i; - int n = 0; - WriteTrace(TraceGlitch, TraceDebug, "-"); - WriteTrace(TraceGlitch, TraceWarning, "grQueryResolutions"); - if ((unsigned int)resTemplate->resolution != GR_QUERY_ANY) - { - res_inf = res_sup = resTemplate->resolution; - } - if ((unsigned int)resTemplate->refresh == GR_QUERY_ANY) WriteTrace(TraceGlitch, TraceWarning, "querying any refresh rate"); - if ((unsigned int)resTemplate->numAuxBuffers == GR_QUERY_ANY) WriteTrace(TraceGlitch, TraceWarning, "querying any numAuxBuffers"); - if ((unsigned int)resTemplate->numColorBuffers == GR_QUERY_ANY) WriteTrace(TraceGlitch, TraceWarning, "querying any numColorBuffers"); - - if (output == NULL) return res_sup - res_inf + 1; - for (i = res_inf; i <= res_sup; i++) - { - output[n].resolution = i; - output[n].refresh = resTemplate->refresh; - output[n].numAuxBuffers = resTemplate->numAuxBuffers; - output[n].numColorBuffers = resTemplate->numColorBuffers; - n++; - } - return res_sup - res_inf + 1; -} - -FX_ENTRY FxBool FX_CALL -grReset(FxU32 /*what*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grReset"); - return 1; -} - FX_ENTRY void FX_CALL grEnable(GrEnableMode_t mode) { @@ -2102,204 +2051,6 @@ grEnable(GrEnableMode_t mode) UMAmode = 1; } -FX_ENTRY void FX_CALL -grDisable(GrEnableMode_t mode) -{ - WriteTrace(TraceGlitch, TraceDebug, "-"); - if (mode == GR_TEXTURE_UMA_EXT) - UMAmode = 0; -} - -FX_ENTRY void FX_CALL -grDisableAllEffects(void) -{ - WriteTrace(TraceGlitch, TraceWarning, "grDisableAllEffects"); -} - -FX_ENTRY void FX_CALL -grErrorSetCallback(GrErrorCallbackFnc_t /*fnc*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grErrorSetCallback"); -} - -FX_ENTRY void FX_CALL -grFinish(void) -{ - glFinish(); - grDisplayGLError("grFinish"); -} - -FX_ENTRY void FX_CALL -grFlush(void) -{ - glFlush(); - grDisplayGLError("grFlush"); -} - -FX_ENTRY void FX_CALL -grTexMultibase(GrChipID_t /*tmu*/, - FxBool /*enable*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexMultibase"); -} - -FX_ENTRY void FX_CALL -grTexMipMapMode(GrChipID_t /*tmu*/, - GrMipMapMode_t /*mode*/, - FxBool /*lodBlend*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexMipMapMode"); -} - -FX_ENTRY void FX_CALL -grTexDownloadTablePartial(GrTexTable_t /*type*/, - void * /*data*/, - int /*start*/, - int /*end*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadTablePartial"); -} - -FX_ENTRY void FX_CALL -grTexDownloadTable(GrTexTable_t /*type*/, - void * /*data*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadTable"); -} - -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*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadMipMapLevelPartial"); - return 1; -} - -FX_ENTRY void FX_CALL -grTexDownloadMipMapLevel(GrChipID_t /*tmu*/, - FxU32 /*startAddress*/, - GrLOD_t /*thisLod*/, - GrLOD_t /*largeLod*/, - GrAspectRatio_t /*aspectRatio*/, - GrTextureFormat_t /*format*/, - FxU32 /*evenOdd*/, - void * /*data*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexDownloadMipMapLevel"); -} - -FX_ENTRY void FX_CALL -grTexNCCTable(GrNCCTable_t /*table*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexNCCTable"); -} - -FX_ENTRY void FX_CALL -grViewport(FxI32 /*x*/, FxI32 /*y*/, FxI32 /*width*/, FxI32 /*height*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grViewport"); -} - -FX_ENTRY void FX_CALL -grDepthRange(FxFloat /*n*/, FxFloat /*f*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grDepthRange"); -} - -FX_ENTRY void FX_CALL -grSplash(float /*x*/, float /*y*/, float /*width*/, float /*height*/, FxU32 /*frame*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grSplash"); -} - -FX_ENTRY FxBool FX_CALL -grSelectContext(GrContext_t /*context*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grSelectContext"); - return 1; -} - -FX_ENTRY void FX_CALL -grAADrawTriangle( - const void * /*a*/, const void * /*b*/, const void * /*c*/, - FxBool /*ab_antialias*/, FxBool /*bc_antialias*/, FxBool /*ca_antialias*/ -) -{ - WriteTrace(TraceGlitch, TraceWarning, "grAADrawTriangle"); -} - -FX_ENTRY void FX_CALL -grAlphaControlsITRGBLighting(FxBool /*enable*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grAlphaControlsITRGBLighting"); -} - -FX_ENTRY void FX_CALL -grGlideSetVertexLayout(const void * /*layout*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideSetVertexLayout"); -} - -FX_ENTRY void FX_CALL -grGlideGetVertexLayout(void * /*layout*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideGetVertexLayout"); -} - -FX_ENTRY void FX_CALL -grGlideSetState(const void * /*state*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideSetState"); -} - -FX_ENTRY void FX_CALL -grGlideGetState(void * /*state*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grGlideGetState"); -} - -FX_ENTRY void FX_CALL -grLfbWriteColorFormat(GrColorFormat_t /*colorFormat*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbWriteColorFormat"); -} - -FX_ENTRY void FX_CALL -grLfbWriteColorSwizzle(FxBool /*swizzleBytes*/, FxBool /*swapWords*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbWriteColorSwizzle"); -} - -FX_ENTRY void FX_CALL -grLfbConstantDepth(FxU32 /*depth*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbConstantDepth"); -} - -FX_ENTRY void FX_CALL -grLfbConstantAlpha(gfxAlpha_t /*alpha*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grLfbConstantAlpha"); -} - -FX_ENTRY void FX_CALL -grTexMultibaseAddress(GrChipID_t /*tmu*/, - GrTexBaseRange_t /*range*/, - FxU32 /*startAddress*/, - FxU32 /*evenOdd*/, - GrTexInfo * /*info*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexMultibaseAddress"); -} - #ifdef _WIN32 static void CorrectGamma(LPVOID apGammaRamp) { @@ -2377,32 +2128,6 @@ guGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB) CorrectGamma(aGammaRamp); } -FX_ENTRY void FX_CALL -grDitherMode(GrDitherMode_t /*mode*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grDitherMode"); -} - -void grChromaRangeExt(GrColor_t /*color0*/, GrColor_t /*color1*/, FxU32 /*mode*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grChromaRangeExt"); -} - -void grChromaRangeModeExt(GrChromakeyMode_t /*mode*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grChromaRangeModeExt"); -} - -void grTexChromaRangeExt(GrChipID_t /*tmu*/, GrColor_t /*color0*/, GrColor_t /*color1*/, GrTexChromakeyMode_t /*mode*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexChromaRangeExt"); -} - -void grTexChromaModeExt(GrChipID_t /*tmu*/, GrChromakeyMode_t /*mode*/) -{ - WriteTrace(TraceGlitch, TraceWarning, "grTexChromaRangeModeExt"); -} - static const char * GL_errors[7 + 1] = { "GL_NO_ERROR", /* "There is no current error." */ "GL_INVALID_ENUM", /* "Invalid parameter." */