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

[video] rename grSstWinClose to gfxSstWinClose

This commit is contained in:
zilmar 2017-05-22 20:52:09 +10:00
parent 4c62e09b2c
commit 158005ef61
4 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Project64-video/Main.cpp
View File

@ -661,7 +661,7 @@ void ReleaseGfx()
} }
// Release graphics // Release graphics
grSstWinClose(gfx_context); gfxSstWinClose(gfx_context);
GfxInitDone = FALSE; GfxInitDone = FALSE;
rdp.window_changed = TRUE; rdp.window_changed = TRUE;

4
Source/Project64-video/Renderer/OGLESglitchmain.cpp
View File

@ -536,8 +536,7 @@ FX_ENTRY GrContext_t FX_CALL grSstWinOpen(GrColorFormat_t color_format, GrOrigin
return 1; return 1;
} }
FX_ENTRY FxBool FX_CALL FxBool gfxSstWinClose(GrContext_t context)
grSstWinClose(GrContext_t context)
{ {
int i, clear_texbuff = use_fbo; int i, clear_texbuff = use_fbo;
WriteTrace(TraceGlitch, TraceDebug, "context: %d", context); WriteTrace(TraceGlitch, TraceDebug, "context: %d", context);
@ -579,7 +578,6 @@ grSstWinClose(GrContext_t context)
remove_tex(0, 0xfffffff); remove_tex(0, 0xfffffff);
#endif #endif
//*/
#ifdef _WIN32 #ifdef _WIN32
if (hGLRC) if (hGLRC)
{ {

9
Source/Project64-video/Renderer/OGLglitchmain.cpp
View File

@ -533,7 +533,7 @@ grSstWinOpen(
if ((hGLRC = wglCreateContext(hDC)) == 0) if ((hGLRC = wglCreateContext(hDC)) == 0)
{ {
WriteTrace(TraceGlitch, TraceWarning, "wglCreateContext failed!"); WriteTrace(TraceGlitch, TraceWarning, "wglCreateContext failed!");
grSstWinClose(0); gfxSstWinClose(0);
return FXFALSE; return FXFALSE;
} }
@ -544,7 +544,7 @@ grSstWinOpen(
if (!wglMakeCurrent(hDC, hGLRC)) if (!wglMakeCurrent(hDC, hGLRC))
{ {
WriteTrace(TraceGlitch, TraceWarning, "wglMakeCurrent failed!"); WriteTrace(TraceGlitch, TraceWarning, "wglMakeCurrent failed!");
grSstWinClose(0); gfxSstWinClose(0);
return FXFALSE; return FXFALSE;
} }
} }
@ -818,8 +818,7 @@ grSstWinOpen(
return 1; return 1;
} }
FX_ENTRY FxBool FX_CALL FxBool gfxSstWinClose(GrContext_t context)
grSstWinClose(GrContext_t context)
{ {
int i; int i;
#ifndef WIN32 #ifndef WIN32
@ -1233,7 +1232,7 @@ grGet(FxU32 pname, FxU32 plength, FxI32 *params)
if (!nbTextureUnits) if (!nbTextureUnits)
{ {
grSstWinOpen(GR_COLORFORMAT_ARGB, GR_ORIGIN_UPPER_LEFT, 2, 1); grSstWinOpen(GR_COLORFORMAT_ARGB, GR_ORIGIN_UPPER_LEFT, 2, 1);
grSstWinClose(0); gfxSstWinClose(0);
} }
#ifdef VOODOO1 #ifdef VOODOO1
params[0] = 1; params[0] = 1;

3
Source/Project64-video/Renderer/Renderer.h
View File

@ -17,8 +17,9 @@
#include "../GlideExtensions.h" #include "../GlideExtensions.h"
void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy); void gfxClipWindow(FxU32 minx, FxU32 miny, FxU32 maxx, FxU32 maxy);
FxU32 gfxTexMinAddress(GrChipID_t tmu);
void gfxColorMask(FxBool rgb, FxBool a); void gfxColorMask(FxBool rgb, FxBool a);
FxU32 gfxTexMinAddress(GrChipID_t tmu);
FxBool gfxSstWinClose(GrContext_t context);
extern uint32_t nbTextureUnits; extern uint32_t nbTextureUnits;
extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y; extern uint32_t g_scr_res_x, g_scr_res_y, g_res_x, g_res_y;