From 6015a3c8b904cec928fca4f02de15fd3572a160d Mon Sep 17 00:00:00 2001 From: Logan McNaughton Date: Thu, 8 Oct 2020 07:10:04 -0700 Subject: [PATCH] update gliden64 --- GLideN64/src/Config.h | 1 - GLideN64/src/DisplayWindow.cpp | 4 +--- GLideN64/src/DisplayWindow.h | 1 + .../mupen64plus/mupen64plus_DisplayWindow.cpp | 14 ++++++++++++++ .../windows/windows_DisplayWindow.cpp | 6 ++++++ GLideN64/src/RSP.cpp | 3 --- GLideN64/src/gDP.cpp | 7 ------- 7 files changed, 22 insertions(+), 14 deletions(-) diff --git a/GLideN64/src/Config.h b/GLideN64/src/Config.h index 4ad489d..44767f1 100644 --- a/GLideN64/src/Config.h +++ b/GLideN64/src/Config.h @@ -230,7 +230,6 @@ struct Config #define hack_blurPauseScreen (1<<2) //Game copies frame buffer to depth buffer area, CPU blurs it. That image is used as background for pause screen. #define hack_clearAloneDepthBuffer (1<<3) //Force clear depth buffer if there is no frame buffer for it. Multiplayer in GE and PD. #define hack_StarCraftBackgrounds (1<<4) //StarCraft special check for frame buffer usage. -#define hack_texrect_shade_alpha (1<<5) //Set vertex alpha to 1 when texrect alpha combiner uses shade. Pokemon Stadium 2 #define hack_subscreen (1<<6) //Fix subscreen delay in Zelda OOT and Doubutsu no Mori #define hack_blastCorps (1<<7) //Blast Corps black polygons #define hack_rectDepthBufferCopyPD (1<<8) //Copy depth buffer only when game need it. Optimized for PD diff --git a/GLideN64/src/DisplayWindow.cpp b/GLideN64/src/DisplayWindow.cpp index 13bbca0..db89ff8 100644 --- a/GLideN64/src/DisplayWindow.cpp +++ b/GLideN64/src/DisplayWindow.cpp @@ -31,9 +31,7 @@ void DisplayWindow::stop() void DisplayWindow::restart() { - //setWindowSize(config.video.windowedWidth, config.video.windowedHeight); - m_resizeWidth = config.video.windowedWidth; - m_resizeHeight = config.video.windowedHeight; + _restart(); m_bResizeWindow = true; } diff --git a/GLideN64/src/DisplayWindow.h b/GLideN64/src/DisplayWindow.h index b4e61ee..b8d73e0 100644 --- a/GLideN64/src/DisplayWindow.h +++ b/GLideN64/src/DisplayWindow.h @@ -72,6 +72,7 @@ private: virtual bool _start() = 0; virtual void _stop() = 0; + virtual void _restart() = 0; virtual void _swapBuffers() = 0; virtual void _saveScreenshot() = 0; virtual void _saveBufferContent(graphics::ObjectHandle _fbo, CachedTexture *_pTexture) = 0; diff --git a/GLideN64/src/Graphics/OpenGLContext/mupen64plus/mupen64plus_DisplayWindow.cpp b/GLideN64/src/Graphics/OpenGLContext/mupen64plus/mupen64plus_DisplayWindow.cpp index ff23b30..1cf734c 100644 --- a/GLideN64/src/Graphics/OpenGLContext/mupen64plus/mupen64plus_DisplayWindow.cpp +++ b/GLideN64/src/Graphics/OpenGLContext/mupen64plus/mupen64plus_DisplayWindow.cpp @@ -32,6 +32,7 @@ private: bool _start() override; void _stop() override; + void _restart() override; void _swapBuffers() override; void _saveScreenshot() override; void _saveBufferContent(graphics::ObjectHandle _fbo, CachedTexture *_pTexture) override; @@ -130,6 +131,19 @@ void DisplayWindowMupen64plus::_stop() FunctionWrapper::CoreVideo_Quit(); } +void DisplayWindowMupen64plus::_restart() +{ +#ifdef M64P_GLIDENUI + if (_supportsWithRateFunctions && m_bFullscreen) { + m_resizeWidth = config.video.fullscreenWidth; + m_resizeHeight = config.video.fullscreenHeight; + } else { + m_resizeWidth = config.video.windowedWidth; + m_resizeHeight = config.video.windowedHeight; + } +#endif // M64P_GLIDENUI +} + void DisplayWindowMupen64plus::_swapBuffers() { // if emulator defined a render callback function, call it before buffer swap diff --git a/GLideN64/src/Graphics/OpenGLContext/windows/windows_DisplayWindow.cpp b/GLideN64/src/Graphics/OpenGLContext/windows/windows_DisplayWindow.cpp index 3070ed0..0e7a164 100644 --- a/GLideN64/src/Graphics/OpenGLContext/windows/windows_DisplayWindow.cpp +++ b/GLideN64/src/Graphics/OpenGLContext/windows/windows_DisplayWindow.cpp @@ -20,6 +20,7 @@ public: private: bool _start() override; void _stop() override; + void _restart() override; void _swapBuffers() override; void _saveScreenshot() override; void _saveBufferContent(graphics::ObjectHandle _fbo, CachedTexture *_pTexture) override; @@ -49,6 +50,11 @@ void DisplayWindowWindows::_stop() FunctionWrapper::windowsStop(); } +void DisplayWindowWindows::_restart() +{ + +} + void DisplayWindowWindows::_swapBuffers() { //Don't let the command queue grow too big buy waiting on no more swap buffers being queued diff --git a/GLideN64/src/RSP.cpp b/GLideN64/src/RSP.cpp index 2c53c76..88bd4b6 100644 --- a/GLideN64/src/RSP.cpp +++ b/GLideN64/src/RSP.cpp @@ -305,9 +305,6 @@ void RSP_Init() config.generalEmulation.hacks |= hack_clearAloneDepthBuffer; else if (strstr(RSP.romname, (const char *)"STARCRAFT 64") != nullptr) config.generalEmulation.hacks |= hack_StarCraftBackgrounds; - else if (strstr(RSP.romname, (const char *)"POKEMON STADIUM 2") != nullptr || - strstr(RSP.romname, (const char *)"Bottom of the 9th") != nullptr) - config.generalEmulation.hacks |= hack_texrect_shade_alpha; else if (strstr(RSP.romname, (const char *)"THE LEGEND OF ZELDA") != nullptr || strstr(RSP.romname, (const char *)"ZELDA MASTER QUEST") != nullptr) config.generalEmulation.hacks |= hack_subscreen | hack_ZeldaMonochrome; diff --git a/GLideN64/src/gDP.cpp b/GLideN64/src/gDP.cpp index 0bb81c8..c8b9089 100644 --- a/GLideN64/src/gDP.cpp +++ b/GLideN64/src/gDP.cpp @@ -863,13 +863,6 @@ void gDPTextureRectangle(f32 ulx, f32 uly, f32 lrx, f32 lry, s32 tile, s16 s, s1 if (s == 0x4000 && (gDP.colorImage.width + gSP.textureTile[0]->uls < 512)) s = 0; - gDP.rectColor = gDPInfo::Color(); - if (gDP.otherMode.cycleType < G_CYC_COPY) { - if ((config.generalEmulation.hacks & hack_texrect_shade_alpha) != 0 && - gDP.combine.mA0 == G_ACMUX_0 && gDP.combine.aA0 == G_ACMUX_SHADE) - gDP.rectColor.a = 1.0f; - } - GraphicsDrawer & drawer = dwnd().getDrawer(); GraphicsDrawer::TexturedRectParams params(ulx, uly, lrx, lry, dsdx, dtdy, s, t, flip, false, true, frameBufferList().getCurrent());