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

Added a game property for the "Enable CPU Access" video option. Patch by Link_to_the_past. 

git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6641 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
skidau 2010-12-22 01:05:29 +00:00
parent 9584b5b335
commit 0d5480073f
3 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Source/Core/DolphinWX/Src/ISOProperties.cpp
View File

@ -337,6 +337,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video")); sbVideoOverrides = new wxStaticBoxSizer(wxVERTICAL, m_GameConfig, _("Video"));
ForceFiltering = new wxCheckBox(m_GameConfig, ID_FORCEFILTERING, _("Force Filtering"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); ForceFiltering = new wxCheckBox(m_GameConfig, ID_FORCEFILTERING, _("Force Filtering"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
EFBCopyEnable = new wxCheckBox(m_GameConfig, ID_EFBCOPYENABLE, _("Enable Copy to EFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EFBCopyEnable = new wxCheckBox(m_GameConfig, ID_EFBCOPYENABLE, _("Enable Copy to EFB"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
EFBAccessEnable = new wxCheckBox(m_GameConfig, ID_EFBACCESSENABLE, _("Enable CPU Access"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
EFBToTextureEnable = new wxCheckBox(m_GameConfig, ID_EFBTOTEXTUREENABLE, _("Enable EFB To Texture"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); EFBToTextureEnable = new wxCheckBox(m_GameConfig, ID_EFBTOTEXTUREENABLE, _("Enable EFB To Texture"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
SafeTextureCache = new wxCheckBox(m_GameConfig, ID_SAFETEXTURECACHE, _("Accurate Texture Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); SafeTextureCache = new wxCheckBox(m_GameConfig, ID_SAFETEXTURECACHE, _("Accurate Texture Cache"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator); DstAlphaPass = new wxCheckBox(m_GameConfig, ID_DSTALPHAPASS, _("Distance Alpha Pass"), wxDefaultPosition, wxDefaultSize, wxCHK_3STATE|wxCHK_ALLOW_3RD_STATE_FOR_USER, wxDefaultValidator);
@ -381,6 +382,7 @@ void CISOProperties::CreateGUIControls(bool IsWad)
sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5); sbWiiOverrides->Add(EnableWideScreen, 0, wxEXPAND|wxLEFT, 5);
sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(ForceFiltering, 0, wxEXPAND|wxLEFT, 5);
sbVideoOverrides->Add(EFBCopyEnable, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBCopyEnable, 0, wxEXPAND|wxLEFT, 5);
sbVideoOverrides->Add(EFBAccessEnable, 0, wxEXPAND|wxLEFT, 5);
sbVideoOverrides->Add(EFBToTextureEnable, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(EFBToTextureEnable, 0, wxEXPAND|wxLEFT, 5);
sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(SafeTextureCache, 0, wxEXPAND|wxLEFT, 5);
sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5); sbVideoOverrides->Add(DstAlphaPass, 0, wxEXPAND|wxLEFT, 5);
@ -881,6 +883,11 @@ void CISOProperties::LoadGameConfig()
else else
EFBCopyEnable->Set3StateValue(wxCHK_UNDETERMINED); EFBCopyEnable->Set3StateValue(wxCHK_UNDETERMINED);
if (GameIni.Get("Video", "EFBAccessEnable", &bTemp))
EFBAccessEnable->Set3StateValue((wxCheckBoxState)bTemp);
else
EFBAccessEnable->Set3StateValue(wxCHK_UNDETERMINED);
if (GameIni.Get("Video", "EFBToTextureEnable", &bTemp)) if (GameIni.Get("Video", "EFBToTextureEnable", &bTemp))
EFBToTextureEnable->Set3StateValue((wxCheckBoxState)bTemp); EFBToTextureEnable->Set3StateValue((wxCheckBoxState)bTemp);
else else
@ -992,6 +999,11 @@ bool CISOProperties::SaveGameConfig()
else else
GameIni.Set("Video", "EFBCopyEnable", EFBCopyEnable->Get3StateValue()); GameIni.Set("Video", "EFBCopyEnable", EFBCopyEnable->Get3StateValue());
if (EFBAccessEnable->Get3StateValue() == wxCHK_UNDETERMINED)
GameIni.DeleteKey("Video", "EFBAccessEnable");
else
GameIni.Set("Video", "EFBAccessEnable", EFBAccessEnable->Get3StateValue());
if (EFBToTextureEnable->Get3StateValue() == wxCHK_UNDETERMINED) if (EFBToTextureEnable->Get3StateValue() == wxCHK_UNDETERMINED)
GameIni.DeleteKey("Video", "EFBToTextureEnable"); GameIni.DeleteKey("Video", "EFBToTextureEnable");
else else

3
Source/Core/DolphinWX/Src/ISOProperties.h
View File

@ -90,7 +90,7 @@ class CISOProperties : public wxDialog
wxCheckBox *EnableProgressiveScan, *EnableWideScreen; wxCheckBox *EnableProgressiveScan, *EnableWideScreen;
// Video // Video
wxCheckBox *ForceFiltering, wxCheckBox *ForceFiltering,
*EFBCopyEnable, *EFBToTextureEnable, *EFBCopyEnable, *EFBAccessEnable, *EFBToTextureEnable,
*SafeTextureCache, *DstAlphaPass, *UseXFB, *UseZTPSpeedupHack, *SafeTextureCache, *DstAlphaPass, *UseXFB, *UseZTPSpeedupHack,
*DListCache; *DListCache;
wxStaticText *Hacktext; wxStaticText *Hacktext;
@ -172,6 +172,7 @@ class CISOProperties : public wxDialog
ID_MERGEBLOCKS, ID_MERGEBLOCKS,
ID_FORCEFILTERING, ID_FORCEFILTERING,
ID_EFBCOPYENABLE, ID_EFBCOPYENABLE,
ID_EFBACCESSENABLE,
ID_EFBTOTEXTUREENABLE, ID_EFBTOTEXTUREENABLE,
ID_SAFETEXTURECACHE, ID_SAFETEXTURECACHE,
ID_DSTALPHAPASS, ID_DSTALPHAPASS,

2
Source/Core/VideoCommon/Src/VideoConfig.cpp
View File

@ -135,6 +135,8 @@ void VideoConfig::GameIniLoad(const char *ini_file)
iniFile.Get("Video", "EFBCopyEnable", &bEFBCopyEnable); iniFile.Get("Video", "EFBCopyEnable", &bEFBCopyEnable);
if (iniFile.Exists("Video", "EFBCopyDisableHotKey")) if (iniFile.Exists("Video", "EFBCopyDisableHotKey"))
iniFile.Get("Video", "EFBCopyDisableHotKey", &bOSDHotKey); iniFile.Get("Video", "EFBCopyDisableHotKey", &bOSDHotKey);
if (iniFile.Exists("Video", "EFBAccessEnable"))
iniFile.Get("Video", "EFBAccessEnable", &bEFBAccessEnable);
if (iniFile.Exists("Video", "EFBToTextureEnable")) if (iniFile.Exists("Video", "EFBToTextureEnable"))
iniFile.Get("Video", "EFBToTextureEnable", &bCopyEFBToTexture); iniFile.Get("Video", "EFBToTextureEnable", &bCopyEFBToTexture);
if (iniFile.Exists("Video", "EFBScaledCopy")) if (iniFile.Exists("Video", "EFBScaledCopy"))