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

Fixed a bug with 3D core hot swapping when no ROM has been loaded.

This commit is contained in:
luigi__ 2008-12-28 17:47:34 +00:00
parent baad85f605
commit 8cec94c1f1
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
desmume/src/render3D.cpp
View File

@ -50,5 +50,9 @@ void NDS_3D_ChangeCore(int newCore)
{
gpu3D->NDS_3D_Close();
NDS_3D_SetDriver(newCore);
gpu3D->NDS_3D_Init();
if(gpu3D->NDS_3D_Init() == 0)
{
NDS_3D_SetDriver(GPU3D_NULL);
gpu3D->NDS_3D_Init();
}
}

14
desmume/src/windows/main.cpp
View File

@ -897,14 +897,6 @@ DWORD WINAPI run()
return -1;
}
if (!gpu3D->NDS_3D_Init ())
{
char err[100];
sprintf(err, "Unable to initialize the %s renderer", gpu3D->name);
MessageBox(hwnd,err,"Error",MB_OK);
return -1;
}
QueryPerformanceFrequency((LARGE_INTEGER *)&freq);
QueryPerformanceCounter((LARGE_INTEGER *)&lastticks);
OneFrameTime = freq / 60;
@ -1385,7 +1377,7 @@ int WINAPI WinMain (HINSTANCE hThisInstance,
}
cur3DCore = GetPrivateProfileInt("3D", "Renderer", GPU3D_OPENGL, IniName);
NDS_3D_ChangeCore(cur3DCore, false);
NDS_3D_ChangeCore(cur3DCore);
#ifdef BETA_VERSION
EnableMenuItem (mainMenu, IDM_SUBMITBUGREPORT, MF_GRAYED);
@ -2561,7 +2553,7 @@ LRESULT CALLBACK GFX3DSettingsDlgProc(HWND hw, UINT msg, WPARAM wp, LPARAM lp)
{
case IDOK:
{
NDS_3D_ChangeCore(ComboBox_GetCurSel(GetDlgItem(hw, IDC_3DCORE)), (execute ? true : false));
NDS_3D_ChangeCore(ComboBox_GetCurSel(GetDlgItem(hw, IDC_3DCORE)));
WritePrivateProfileInt("3D", "Renderer", cur3DCore, IniName);
}
case IDCANCEL:
@ -2572,7 +2564,7 @@ LRESULT CALLBACK GFX3DSettingsDlgProc(HWND hw, UINT msg, WPARAM wp, LPARAM lp)
case IDC_DEFAULT:
{
NDS_3D_ChangeCore(GPU3D_OPENGL, (execute ? true : false));
NDS_3D_ChangeCore(GPU3D_OPENGL);
ComboBox_SetCurSel(GetDlgItem(hw, IDC_3DCORE), GPU3D_OPENGL);
WritePrivateProfileInt("3D", "Renderer", GPU3D_OPENGL, IniName);
}