piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-22 22:00:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

some small changes to OGL plugin.

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@1856 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
omegadox
2009-01-12 15:00:00 +00:00
parent ff5a8e7757
commit d9511addf3
5 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Plugins/Plugin_VideoOGL/Src/BPStructs.cpp
View File

@ -456,14 +456,14 @@ void BPWritten(int addr, int changes, int newval)
glViewport(rc.left,rc.bottom,rc.right,rc.top); glViewport(rc.left,rc.bottom,rc.right,rc.top);
glScissor(rc.left,rc.bottom,rc.right,rc.top); glScissor(rc.left,rc.bottom,rc.right,rc.top);
} }
else if (g_Config.bEFBToTextureEnable) { else if (g_Config.bCopyEFBToRAM) {
TextureMngr::CopyRenderTargetToTexture(bpmem.copyTexDest<<5, bpmem.zcontrol.pixel_format==PIXELFMT_Z24, PE_copy.intensity_fmt>0,
(PE_copy.target_pixel_format/2)+((PE_copy.target_pixel_format&1)*8), PE_copy.half_scale>0, &rc);
}
else {
TextureConverter::EncodeToRam(bpmem.copyTexDest<<5, bpmem.zcontrol.pixel_format==PIXELFMT_Z24, PE_copy.intensity_fmt>0, TextureConverter::EncodeToRam(bpmem.copyTexDest<<5, bpmem.zcontrol.pixel_format==PIXELFMT_Z24, PE_copy.intensity_fmt>0,
(PE_copy.target_pixel_format/2)+((PE_copy.target_pixel_format&1)*8), PE_copy.half_scale>0, rc); (PE_copy.target_pixel_format/2)+((PE_copy.target_pixel_format&1)*8), PE_copy.half_scale>0, rc);
} }
else {
TextureMngr::CopyRenderTargetToTexture(bpmem.copyTexDest<<5, bpmem.zcontrol.pixel_format==PIXELFMT_Z24, PE_copy.intensity_fmt>0,
(PE_copy.target_pixel_format/2)+((PE_copy.target_pixel_format&1)*8), PE_copy.half_scale>0, &rc);
}
} }
else { else {
// EFB to XFB // EFB to XFB

4
Source/Plugins/Plugin_VideoOGL/Src/Config.cpp
View File

@ -82,7 +82,7 @@ void Config::Load()
iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0); iniFile.Get("Hacks", "EFBCopyDisableHotKey", &bEFBCopyDisableHotKey, 0);
iniFile.Get("Hacks", "ProjectionHax1", &bProjectionHax1, 0); iniFile.Get("Hacks", "ProjectionHax1", &bProjectionHax1, 0);
iniFile.Get("Hacks", "ProjectionHax2", &bProjectionHax2, 0); iniFile.Get("Hacks", "ProjectionHax2", &bProjectionHax2, 0);
iniFile.Get("Hacks", "EFBToTextureEnable", &bEFBToTextureEnable, 1); iniFile.Get("Hacks", "EFBToTextureEnable", &bCopyEFBToRAM, 0);
} }
void Config::Save() void Config::Save()
@ -121,7 +121,7 @@ void Config::Save()
iniFile.Set("Hacks", "EFBCopyDisableHotKey", bEFBCopyDisableHotKey); iniFile.Set("Hacks", "EFBCopyDisableHotKey", bEFBCopyDisableHotKey);
iniFile.Set("Hacks", "ProjectionHax1", bProjectionHax1); iniFile.Set("Hacks", "ProjectionHax1", bProjectionHax1);
iniFile.Set("Hacks", "ProjectionHax2", bProjectionHax2); iniFile.Set("Hacks", "ProjectionHax2", bProjectionHax2);
iniFile.Set("Hacks", "EFBToTextureEnable", bEFBToTextureEnable); iniFile.Set("Hacks", "EFBToTextureEnable", bCopyEFBToRAM);
iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini"); iniFile.Save(FULL_CONFIG_DIR "gfx_opengl.ini");
} }

2
Source/Plugins/Plugin_VideoOGL/Src/Config.h
View File

@ -68,7 +68,7 @@ struct Config
bool bEFBCopyDisableHotKey; bool bEFBCopyDisableHotKey;
bool bProjectionHax1; bool bProjectionHax1;
bool bProjectionHax2; bool bProjectionHax2;
bool bEFBToTextureEnable; bool bCopyEFBToRAM;
int iLog; // CONF_ bits int iLog; // CONF_ bits
int iSaveTargetId; int iSaveTargetId;

25
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.cpp
View File

@ -54,7 +54,7 @@ BEGIN_EVENT_TABLE(ConfigDialog,wxDialog)
EVT_CHECKBOX(ID_PROJECTIONHACK1,ConfigDialog::AdvancedSettingsChanged) EVT_CHECKBOX(ID_PROJECTIONHACK1,ConfigDialog::AdvancedSettingsChanged)
EVT_CHECKBOX(ID_PROJECTIONHACK2,ConfigDialog::AdvancedSettingsChanged) EVT_CHECKBOX(ID_PROJECTIONHACK2,ConfigDialog::AdvancedSettingsChanged)
EVT_CHECKBOX(ID_SAFETEXTURECACHE,ConfigDialog::AdvancedSettingsChanged) EVT_CHECKBOX(ID_SAFETEXTURECACHE,ConfigDialog::AdvancedSettingsChanged)
EVT_CHECKBOX(ID_EFBTOTEXTUREENABLE, ConfigDialog::AdvancedSettingsChanged) EVT_CHECKBOX(ID_COPYEFBTORAM, ConfigDialog::AdvancedSettingsChanged)
EVT_DIRPICKER_CHANGED(ID_TEXTUREPATH, ConfigDialog::TexturePathChange) EVT_DIRPICKER_CHANGED(ID_TEXTUREPATH, ConfigDialog::TexturePathChange)
END_EVENT_TABLE() END_EVENT_TABLE()
@ -228,8 +228,8 @@ void ConfigDialog::CreateGUIControls()
// Hacks // Hacks
sbHacks = new wxStaticBoxSizer(wxVERTICAL, m_PageAdvanced, wxT("Hacks")); sbHacks = new wxStaticBoxSizer(wxVERTICAL, m_PageAdvanced, wxT("Hacks"));
m_EFBCopyDisable = new wxCheckBox(m_PageAdvanced, m_EFBCopyDisable = new wxCheckBox(m_PageAdvanced,
ID_EFBCOPYDISABLE, wxT("Disable copy EFB"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); ID_EFBCOPYDISABLE, wxT("Disable copy EFB to texture"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_EFBCopyDisable->SetToolTip(wxT("Do not copy the Embedded Framebuffer (EFB)." m_EFBCopyDisable->SetToolTip(wxT("Do not copy the Extended Framebuffer (EFB) to texture."
" This may result in a speed increase.")); " This may result in a speed increase."));
m_EFBCopyDisable->Enable(true); m_EFBCopyDisable->Enable(true);
m_EFBCopyDisable->SetValue(g_Config.bEFBCopyDisable); m_EFBCopyDisable->SetValue(g_Config.bEFBCopyDisable);
@ -242,15 +242,15 @@ void ConfigDialog::CreateGUIControls()
#endif #endif
m_EFBCopyDisableHotKey->SetValue(g_Config.bEFBCopyDisableHotKey); m_EFBCopyDisableHotKey->SetValue(g_Config.bEFBCopyDisableHotKey);
m_SafeTextureCache = new wxCheckBox(m_PageAdvanced, ID_SAFETEXTURECACHE, wxT("Safe texture cache"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_SafeTextureCache = new wxCheckBox(m_PageAdvanced, ID_SAFETEXTURECACHE, wxT("Use Safe texture cache"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_SafeTextureCache->SetToolTip(wxT("This is useful to prevent Metroid Prime from crashing, but can cause problems in other games.")); m_SafeTextureCache->SetToolTip(wxT("This is useful to prevent Metroid Prime from crashing, but can cause problems in other games."));
m_SafeTextureCache->Enable(true); m_SafeTextureCache->Enable(true);
m_SafeTextureCache->SetValue(g_Config.bSafeTextureCache); m_SafeTextureCache->SetValue(g_Config.bSafeTextureCache);
m_EFBToTextureEnable = new wxCheckBox(m_PageAdvanced, ID_EFBTOTEXTUREENABLE, wxT("Copy EFB to texture"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_CopyEFBToRAM = new wxCheckBox(m_PageAdvanced, ID_COPYEFBTORAM, wxT("Copy EFB to system RAM"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_EFBToTextureEnable->SetToolTip(wxT("This is faster than copying the EFB to RAM, but may cause missing/corrupt textures or effects.")); m_CopyEFBToRAM->SetToolTip(wxT("Copies the EFB to RAM instead of a GL texture, this might cause some slowdown but fixes some graphical issues and game issues like broken MP2 scanner issue"));
m_EFBToTextureEnable->Enable(true); m_CopyEFBToRAM->Enable(true);
m_EFBToTextureEnable->SetValue(g_Config.bEFBToTextureEnable); m_CopyEFBToRAM->SetValue(g_Config.bCopyEFBToRAM);
m_ProjectionHax1 = new wxCheckBox(m_PageAdvanced, ID_PROJECTIONHACK1, wxT("Projection before R945"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator); m_ProjectionHax1 = new wxCheckBox(m_PageAdvanced, ID_PROJECTIONHACK1, wxT("Projection before R945"), wxDefaultPosition, wxDefaultSize, 0, wxDefaultValidator);
m_ProjectionHax1->SetToolTip(wxT("This may reveal otherwise invisible graphics" m_ProjectionHax1->SetToolTip(wxT("This may reveal otherwise invisible graphics"
@ -292,7 +292,7 @@ void ConfigDialog::CreateGUIControls()
sHacks->Add(m_ProjectionHax1, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL, 5); sHacks->Add(m_ProjectionHax1, wxGBPosition(1, 0), wxGBSpan(1, 1), wxALL, 5);
sHacks->Add(m_ProjectionHax2, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5); sHacks->Add(m_ProjectionHax2, wxGBPosition(2, 0), wxGBSpan(1, 2), wxALL, 5);
sHacks->Add(m_SafeTextureCache, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 5); sHacks->Add(m_SafeTextureCache, wxGBPosition(3, 0), wxGBSpan(1, 1), wxALL, 5);
sHacks->Add(m_EFBToTextureEnable, wxGBPosition(1, 1), wxGBSpan(1, 1), wxALL, 5); sHacks->Add(m_CopyEFBToRAM, wxGBPosition(4, 0), wxGBSpan(1, 1), wxALL, 5);
sbHacks->Add(sHacks); sbHacks->Add(sHacks);
sAdvanced->Add(sbHacks, 0, wxEXPAND|wxALL, 5); sAdvanced->Add(sbHacks, 0, wxEXPAND|wxALL, 5);
m_PageAdvanced->SetSizer(sAdvanced); m_PageAdvanced->SetSizer(sAdvanced);
@ -443,12 +443,11 @@ void ConfigDialog::AdvancedSettingsChanged(wxCommandEvent& event)
case ID_SAFETEXTURECACHE: case ID_SAFETEXTURECACHE:
g_Config.bSafeTextureCache = m_SafeTextureCache->IsChecked(); g_Config.bSafeTextureCache = m_SafeTextureCache->IsChecked();
break; break;
case ID_EFBTOTEXTUREENABLE: case ID_COPYEFBTORAM:
{ {
bool wasEnabled = g_Config.bEFBToTextureEnable; if(g_Config.bCopyEFBToRAM)
g_Config.bEFBToTextureEnable = m_EFBToTextureEnable->IsChecked();
if(wasEnabled && !g_Config.bEFBToTextureEnable)
TextureMngr::ClearRenderTargets(); TextureMngr::ClearRenderTargets();
g_Config.bCopyEFBToRAM = m_CopyEFBToRAM->IsChecked();
} }
break; break;
default: default:

4
Source/Plugins/Plugin_VideoOGL/Src/GUI/ConfigDlg.h
View File

@ -101,7 +101,7 @@ class ConfigDialog : public wxDialog
wxCheckBox *m_ProjectionHax1; wxCheckBox *m_ProjectionHax1;
wxCheckBox *m_ProjectionHax2; wxCheckBox *m_ProjectionHax2;
wxCheckBox *m_SafeTextureCache; wxCheckBox *m_SafeTextureCache;
wxCheckBox *m_EFBToTextureEnable; wxCheckBox *m_CopyEFBToRAM;
enum enum
{ {
@ -147,7 +147,7 @@ class ConfigDialog : public wxDialog
ID_EFBCOPYDISABLE, ID_EFBCOPYDISABLEHOTKEY, ID_EFBCOPYDISABLE, ID_EFBCOPYDISABLEHOTKEY,
ID_PROJECTIONHACK1, ID_PROJECTIONHACK1,
ID_PROJECTIONHACK2, ID_PROJECTIONHACK2,
ID_EFBTOTEXTUREENABLE ID_COPYEFBTORAM
}; };
void OnClose(wxCloseEvent& event); void OnClose(wxCloseEvent& event);