From 7a0c0175719685ff9a78383f16004e5959bfc6f5 Mon Sep 17 00:00:00 2001 From: zilmar Date: Thu, 21 Jan 2016 05:55:46 +1100 Subject: [PATCH] [Glide64] Remove mutexProcessDList --- Source/Glide64/Config.cpp | 2 -- Source/Glide64/Gfx_1.3.h | 1 - Source/Glide64/Main.cpp | 7 ------- Source/Glide64/rdp.cpp | 20 +------------------- 4 files changed, 1 insertion(+), 29 deletions(-) diff --git a/Source/Glide64/Config.cpp b/Source/Glide64/Config.cpp index 9701d622e..4fcc9d7a3 100644 --- a/Source/Glide64/Config.cpp +++ b/Source/Glide64/Config.cpp @@ -1070,7 +1070,6 @@ output: none void CALL DllConfig(HWND hParent) { LOG("DllConfig ()\n"); - mutexProcessDList->Lock(); ReadSettings(); if (romopen) @@ -1138,7 +1137,6 @@ void CloseConfig() // hostWindow->UnsubclassWin(); hostWindow->SetHWND(NULL); #endif - mutexProcessDList->Unlock(); } AboutDialog::AboutDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long /*style*/) : diff --git a/Source/Glide64/Gfx_1.3.h b/Source/Glide64/Gfx_1.3.h index e81d66c86..024ee461f 100644 --- a/Source/Glide64/Gfx_1.3.h +++ b/Source/Glide64/Gfx_1.3.h @@ -282,7 +282,6 @@ extern "C" { extern int ev_fullscreen; extern int exception; - extern wxMutex *mutexProcessDList; int InitGfx(); void ReleaseGfx(); diff --git a/Source/Glide64/Main.cpp b/Source/Glide64/Main.cpp index 52d5b6aa6..c10897ab2 100644 --- a/Source/Glide64/Main.cpp +++ b/Source/Glide64/Main.cpp @@ -1149,8 +1149,6 @@ IMPLEMENT_APP_NO_MAIN(wxDLLApp) bool wxDLLApp::OnInit() { - if (mutexProcessDList == NULL) - mutexProcessDList = new wxMutex(wxMUTEX_DEFAULT); wxImage::AddHandler(new wxPNGHandler); wxImage::AddHandler(new wxJPEGHandler); PluginPath(); @@ -1160,11 +1158,6 @@ bool wxDLLApp::OnInit() void wxDLLApp::CleanUp() { wxApp::CleanUp(); - if (mutexProcessDList) - { - delete mutexProcessDList; - mutexProcessDList = NULL; - } if (GFXWindow) { GFXWindow->SetHWND(NULL); diff --git a/Source/Glide64/rdp.cpp b/Source/Glide64/rdp.cpp index 0b2cc4d4f..088f46b4a 100644 --- a/Source/Glide64/rdp.cpp +++ b/Source/Glide64/rdp.cpp @@ -592,15 +592,6 @@ int depth_buffer_fog; EXPORT void CALL ProcessDList(void) { - SoftLocker lock(mutexProcessDList); - if (!lock.IsOk()) //mutex is busy - { - // Set an interrupt to allow the game to continue - *gfx.MI_INTR_REG |= 0x20; - gfx.CheckInterrupts(); - return; - } - no_dlist = false; update_screen_count = 0; ChangeSize(); @@ -794,7 +785,7 @@ EXPORT void CALL ProcessDList(void) if (fullscreen) { ReleaseGfx (); - rdp_reset (); + rdp_reset(); #ifdef TEXTURE_FILTER if (settings.ghq_use) { @@ -4138,15 +4129,6 @@ void CALL ProcessRDPList(void) LOG("ProcessRDPList ()\n"); LRDP("ProcessRDPList ()\n"); - SoftLocker lock(mutexProcessDList); - if (!lock.IsOk()) //mutex is busy - { - // Set an interrupt to allow the game to continue - *gfx.MI_INTR_REG |= 0x20; - gfx.CheckInterrupts(); - return; - } - uint32_t i; uint32_t cmd, length, cmd_length; rdp_cmd_ptr = 0;