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

[Video] Remove evoodoo

This commit is contained in:
zilmar 2017-08-17 17:24:11 +10:00
parent c54d981c83
commit 631c471fe1
3 changed files with 6 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Source/Project64-video/FBtoScreen.cpp
View File

@ -530,11 +530,6 @@ void DrawDepthBufferToScreen(FB_TO_SCREEN_INFO & fb_info)
DrawDepthBufferToScreen256(fb_info); DrawDepthBufferToScreen256(fb_info);
return; return;
} }
if (g_settings->fb_hwfbe_enabled() && !evoodoo)
{
DrawHiresDepthBufferToScreen(fb_info);
return;
}
WriteTrace(TraceRDP, TraceDebug, "DrawDepthBufferToScreen. ul_x=%d, ul_y=%d, lr_x=%d, lr_y=%d, size=%d, addr=%08lx", fb_info.ul_x, fb_info.ul_y, fb_info.lr_x, fb_info.lr_y, fb_info.size, fb_info.addr); WriteTrace(TraceRDP, TraceDebug, "DrawDepthBufferToScreen. ul_x=%d, ul_y=%d, lr_x=%d, lr_y=%d, size=%d, addr=%08lx", fb_info.ul_x, fb_info.ul_y, fb_info.lr_x, fb_info.lr_y, fb_info.size, fb_info.addr);
gfxTexInfo t_info; gfxTexInfo t_info;
uint8_t * image = gfx.RDRAM + fb_info.addr; uint8_t * image = gfx.RDRAM + fb_info.addr;

1
Source/Project64-video/Gfx_1.3.h
View File

@ -63,7 +63,6 @@ extern "C" {
extern bool g_romopen; extern bool g_romopen;
extern int to_fullscreen; extern int to_fullscreen;
extern int evoodoo;
extern int ev_fullscreen; extern int ev_fullscreen;
extern int exception; extern int exception;

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

@ -53,7 +53,6 @@ int GfxInitDone = FALSE;
bool g_romopen = false; bool g_romopen = false;
int exception = FALSE; int exception = FALSE;
int evoodoo = 0;
int ev_fullscreen = 0; int ev_fullscreen = 0;
extern int g_viewport_offset; extern int g_viewport_offset;
@ -465,7 +464,7 @@ int InitGfx()
}; };
unsigned int SST_type = GR_SSTTYPE_Voodoo5; unsigned int SST_type = GR_SSTTYPE_Voodoo5;
// 2Mb Texture boundary // 2Mb Texture boundary
voodoo.has_2mb_tex_boundary = (SST_type < GR_SSTTYPE_Banshee) && !evoodoo; voodoo.has_2mb_tex_boundary = false;
// we get better texture cache hits with UMA on // we get better texture cache hits with UMA on
WriteTrace(TraceGlide64, TraceDebug, "Using TEXUMA extension"); WriteTrace(TraceGlide64, TraceDebug, "Using TEXUMA extension");
@ -677,32 +676,15 @@ EXPORT void CALL ChangeWindow(void)
{ {
WriteTrace(TraceGlide64, TraceDebug, "-"); WriteTrace(TraceGlide64, TraceDebug, "-");
if (evoodoo) if (!ev_fullscreen)
{ {
if (!ev_fullscreen) to_fullscreen = TRUE;
{ ev_fullscreen = TRUE;
to_fullscreen = TRUE;
ev_fullscreen = TRUE;
}
else
{
ev_fullscreen = FALSE;
InitGfx();
}
} }
else else
{ {
// Go to fullscreen at next dlist ev_fullscreen = FALSE;
// This is for compatibility with 1964, which reloads the plugin InitGfx();
// when switching to fullscreen
if (!GfxInitDone)
{
to_fullscreen = TRUE;
}
else
{
ReleaseGfx();
}
} }
} }
@ -829,7 +811,6 @@ int CALL InitiateGFX(GFX_INFO Gfx_Info)
CountCombine(); CountCombine();
ZLUT_init(); ZLUT_init();
evoodoo = 1;
voodoo.has_2mb_tex_boundary = 0; voodoo.has_2mb_tex_boundary = 0;
return TRUE; return TRUE;
} }
@ -945,8 +926,6 @@ void CALL RomOpen(void)
ClearCache(); ClearCache();
BMASK = g_settings->RdramSize() - 1; BMASK = g_settings->RdramSize() - 1;
// ** EVOODOO EXTENSIONS **
evoodoo = 1;
InitGfx(); InitGfx();
} }
@ -1290,10 +1269,6 @@ void newSwapBuffers()
DrawWholeFrameBufferToScreen(); DrawWholeFrameBufferToScreen();
} }
if (g_settings->fb_hwfbe_enabled() && !g_settings->hacks(CSettings::hack_RE2) && !evoodoo)
{
gfxAuxBufferExt(GFX_BUFFER_AUXBUFFER);
}
WriteTrace(TraceGlide64, TraceDebug, "BUFFER SWAPPED"); WriteTrace(TraceGlide64, TraceDebug, "BUFFER SWAPPED");
gfxBufferSwap(g_settings->vsync()); gfxBufferSwap(g_settings->vsync());
if (*gfx.VI_STATUS_REG & 0x08) //gamma correction is used if (*gfx.VI_STATUS_REG & 0x08) //gamma correction is used