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

[Glide64] Remove mutexProcessDList

This commit is contained in:
zilmar 2016-01-21 05:55:46 +11:00
parent 08c518d38c
commit 7a0c017571
4 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/Glide64/Config.cpp
View File

@ -1070,7 +1070,6 @@ output: none
void CALL DllConfig(HWND hParent) void CALL DllConfig(HWND hParent)
{ {
LOG("DllConfig ()\n"); LOG("DllConfig ()\n");
mutexProcessDList->Lock();
ReadSettings(); ReadSettings();
if (romopen) if (romopen)
@ -1138,7 +1137,6 @@ void CloseConfig()
// hostWindow->UnsubclassWin(); // hostWindow->UnsubclassWin();
hostWindow->SetHWND(NULL); hostWindow->SetHWND(NULL);
#endif #endif
mutexProcessDList->Unlock();
} }
AboutDialog::AboutDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long /*style*/) : AboutDialog::AboutDialog(wxWindow* parent, int id, const wxString& title, const wxPoint& pos, const wxSize& size, long /*style*/) :

1
Source/Glide64/Gfx_1.3.h
View File

@ -282,7 +282,6 @@ extern "C" {
extern int ev_fullscreen; extern int ev_fullscreen;
extern int exception; extern int exception;
extern wxMutex *mutexProcessDList;
int InitGfx(); int InitGfx();
void ReleaseGfx(); void ReleaseGfx();

7
Source/Glide64/Main.cpp
View File

@ -1149,8 +1149,6 @@ IMPLEMENT_APP_NO_MAIN(wxDLLApp)
bool wxDLLApp::OnInit() bool wxDLLApp::OnInit()
{ {
if (mutexProcessDList == NULL)
mutexProcessDList = new wxMutex(wxMUTEX_DEFAULT);
wxImage::AddHandler(new wxPNGHandler); wxImage::AddHandler(new wxPNGHandler);
wxImage::AddHandler(new wxJPEGHandler); wxImage::AddHandler(new wxJPEGHandler);
PluginPath(); PluginPath();
@ -1160,11 +1158,6 @@ bool wxDLLApp::OnInit()
void wxDLLApp::CleanUp() void wxDLLApp::CleanUp()
{ {
wxApp::CleanUp(); wxApp::CleanUp();
if (mutexProcessDList)
{
delete mutexProcessDList;
mutexProcessDList = NULL;
}
if (GFXWindow) if (GFXWindow)
{ {
GFXWindow->SetHWND(NULL); GFXWindow->SetHWND(NULL);

20
Source/Glide64/rdp.cpp
View File

@ -592,15 +592,6 @@ int depth_buffer_fog;
EXPORT void CALL ProcessDList(void) 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; no_dlist = false;
update_screen_count = 0; update_screen_count = 0;
ChangeSize(); ChangeSize();
@ -794,7 +785,7 @@ EXPORT void CALL ProcessDList(void)
if (fullscreen) if (fullscreen)
{ {
ReleaseGfx (); ReleaseGfx ();
rdp_reset (); rdp_reset();
#ifdef TEXTURE_FILTER #ifdef TEXTURE_FILTER
if (settings.ghq_use) if (settings.ghq_use)
{ {
@ -4138,15 +4129,6 @@ void CALL ProcessRDPList(void)
LOG("ProcessRDPList ()\n"); LOG("ProcessRDPList ()\n");
LRDP("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 i;
uint32_t cmd, length, cmd_length; uint32_t cmd, length, cmd_length;
rdp_cmd_ptr = 0; rdp_cmd_ptr = 0;