diff --git a/Source/Project64-video/Main.cpp b/Source/Project64-video/Main.cpp index e7001134f..1b2296a43 100644 --- a/Source/Project64-video/Main.cpp +++ b/Source/Project64-video/Main.cpp @@ -480,7 +480,7 @@ int InitGfx() #ifndef ANDROID SetWindowDisplaySize((HWND)gfx.hWnd); #endif - gfx_context = grSstWinOpen(GR_COLORFORMAT_RGBA, GR_ORIGIN_UPPER_LEFT, 2, 1); + gfx_context = gfxSstWinOpen(GR_COLORFORMAT_RGBA, GR_ORIGIN_UPPER_LEFT, 2, 1); if (!gfx_context) { g_Notify->DisplayError("Error setting display mode"); diff --git a/Source/Project64-video/Renderer/OGLESglitchmain.cpp b/Source/Project64-video/Renderer/OGLESglitchmain.cpp index 9370cce08..23b6f4f10 100644 --- a/Source/Project64-video/Renderer/OGLESglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLESglitchmain.cpp @@ -321,7 +321,7 @@ int isWglExtensionSupported(const char *extension) # endif #endif -FX_ENTRY GrContext_t FX_CALL grSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers) +GrContext_t gfxSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers) { static int show_warning = 1; diff --git a/Source/Project64-video/Renderer/OGLglitchmain.cpp b/Source/Project64-video/Renderer/OGLglitchmain.cpp index 5c7133c3b..8c62cc023 100644 --- a/Source/Project64-video/Renderer/OGLglitchmain.cpp +++ b/Source/Project64-video/Renderer/OGLglitchmain.cpp @@ -453,12 +453,7 @@ int isWglExtensionSupported(const char *extension) extern HWND g_hwnd_win; #endif -FX_ENTRY GrContext_t FX_CALL -grSstWinOpen( - GrColorFormat_t color_format, - GrOriginLocation_t origin_location, - int nColBuffers, - int nAuxBuffers) +GrContext_t gfxSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers) { static int show_warning = 1; @@ -802,7 +797,7 @@ grSstWinOpen( ati_sucks = 0; } - grDisplayGLError("grSstWinOpen"); + grDisplayGLError("gfxSstWinOpen"); return 1; } @@ -866,7 +861,7 @@ FxBool gfxSstWinClose(GrContext_t context) //m_pScreen = NULL; #endif return FXTRUE; - } +} void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrLOD_t lodmax, GrAspectRatio_t aspect, GrTextureFormat_t fmt, FxU32 evenOdd) { @@ -995,7 +990,7 @@ void gfxTextureBufferExt(GrChipID_t tmu, FxU32 startAddress, GrLOD_t lodmin, GrL glScissor(0, g_viewport_offset, g_width, g_height); grDisplayGLError("gfxTextureBufferExt :: A"); -} + } else { if (!render_to_texture) //initialization { @@ -1201,7 +1196,7 @@ grGet(FxU32 pname, FxU32 plength, FxI32 *params) if (plength < 4 || params == NULL) return 0; if (!nbTextureUnits) { - grSstWinOpen(GR_COLORFORMAT_ARGB, GR_ORIGIN_UPPER_LEFT, 2, 1); + gfxSstWinOpen(GR_COLORFORMAT_ARGB, GR_ORIGIN_UPPER_LEFT, 2, 1); gfxSstWinClose(0); } #ifdef VOODOO1 @@ -2029,7 +2024,7 @@ grGetGammaTableExt(FxU32 /*nentries*/, FxU32 *red, FxU32 *green, FxU32 *blue) blue[i] = aGammaRamp[2][i] >> 8; } } - } +} FX_ENTRY void FX_CALL guGammaCorrectionRGB(FxFloat gammaR, FxFloat gammaG, FxFloat gammaB) @@ -2144,5 +2139,5 @@ void CHECK_FRAMEBUFFER_STATUS() break; /* programming error; will fail on all hardware */ /*assert(0);*/ -} - } \ No newline at end of file + } +} \ No newline at end of file diff --git a/Source/Project64-video/Renderer/Renderer.h b/Source/Project64-video/Renderer/Renderer.h index eeb1d1a3c..4f9a906e8 100644 --- a/Source/Project64-video/Renderer/Renderer.h +++ b/Source/Project64-video/Renderer/Renderer.h @@ -52,5 +52,7 @@ void gfxDrawLine(const void *a, const void *b); void gfxDrawVertexArray(FxU32 mode, FxU32 Count, void *pointers2); void gfxDrawVertexArrayContiguous(FxU32 mode, FxU32 Count, void *pointers, FxU32 stride); +GrContext_t gfxSstWinOpen(GrColorFormat_t color_format, GrOriginLocation_t origin_location, int nColBuffers, int nAuxBuffers); + extern uint32_t nbTextureUnits; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;