2009-07-28 21:32:10 +00:00
|
|
|
// Copyright (C) 2003 Dolphin Project.
|
2008-12-08 04:46:09 +00:00
|
|
|
|
|
|
|
// This program is free software: you can redistribute it and/or modify
|
|
|
|
// it under the terms of the GNU General Public License as published by
|
|
|
|
// the Free Software Foundation, version 2.0.
|
|
|
|
|
|
|
|
// This program is distributed in the hope that it will be useful,
|
|
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
// GNU General Public License 2.0 for more details.
|
|
|
|
|
|
|
|
// A copy of the GPL 2.0 should have been included with the program.
|
|
|
|
// If not, see http://www.gnu.org/licenses/
|
|
|
|
|
|
|
|
// Official SVN repository and contact information can be found at
|
|
|
|
// http://code.google.com/p/dolphin-emu/
|
|
|
|
|
2010-06-13 19:41:07 +00:00
|
|
|
#ifndef _DX_DLGSETTINGS_H_
|
|
|
|
#define _DX_DLGSETTINGS_H_
|
|
|
|
|
|
|
|
#include <wx/wx.h>
|
|
|
|
#include <wx/dialog.h>
|
|
|
|
#include <wx/textctrl.h>
|
|
|
|
#include <wx/button.h>
|
|
|
|
#include <wx/stattext.h>
|
|
|
|
#include <wx/choice.h>
|
|
|
|
#include <wx/combobox.h>
|
|
|
|
#include <wx/checkbox.h>
|
|
|
|
#include <wx/notebook.h>
|
|
|
|
#include <wx/panel.h>
|
|
|
|
#include <wx/filepicker.h>
|
|
|
|
#include <wx/gbsizer.h>
|
2008-12-08 04:46:09 +00:00
|
|
|
|
2010-06-13 19:41:07 +00:00
|
|
|
class GFXConfigDialogDX : public wxDialog
|
|
|
|
{
|
|
|
|
public:
|
|
|
|
GFXConfigDialogDX(wxWindow *parent, wxWindowID id = 1,
|
|
|
|
#ifdef DEBUGFAST
|
|
|
|
const wxString &title = wxT("DX (DEBUGFAST) Plugin Configuration"),
|
|
|
|
#else
|
|
|
|
#ifndef _DEBUG
|
|
|
|
const wxString &title = wxT("DX Plugin Configuration"),
|
|
|
|
#else
|
|
|
|
const wxString &title = wxT("DX (DEBUG) Plugin Configuration"),
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
const wxPoint& pos = wxDefaultPosition,
|
|
|
|
const wxSize& size = wxDefaultSize,
|
|
|
|
long style = wxDEFAULT_DIALOG_STYLE);
|
|
|
|
virtual ~GFXConfigDialogDX();
|
|
|
|
void CreateGUIControls();
|
|
|
|
void CloseClick(wxCommandEvent& WXUNUSED (event));
|
|
|
|
|
|
|
|
private:
|
|
|
|
DECLARE_EVENT_TABLE();
|
|
|
|
|
|
|
|
wxBoxSizer* sGeneral;
|
|
|
|
wxStaticBoxSizer* sbBasic;
|
|
|
|
wxGridBagSizer* sBasic;
|
|
|
|
wxStaticBoxSizer* sbSTC;
|
|
|
|
wxGridBagSizer* sSTC;
|
|
|
|
|
|
|
|
wxBoxSizer* sEnhancements;
|
|
|
|
wxStaticBoxSizer* sbTextureFilter;
|
|
|
|
wxGridBagSizer* sTextureFilter;
|
|
|
|
wxStaticBoxSizer* sbEFBHacks;
|
|
|
|
wxGridBagSizer* sEFBHacks;
|
|
|
|
|
|
|
|
wxBoxSizer* sAdvanced;
|
|
|
|
wxStaticBoxSizer* sbSettings;
|
|
|
|
wxGridBagSizer* sSettings;
|
|
|
|
wxStaticBoxSizer* sbDataDumping;
|
|
|
|
wxGridBagSizer* sDataDumping;
|
|
|
|
wxStaticBoxSizer* sbDebuggingTools;
|
|
|
|
wxGridBagSizer* sDebuggingTools;
|
|
|
|
|
|
|
|
|
|
|
|
wxButton *m_Close;
|
|
|
|
|
|
|
|
wxNotebook *m_Notebook;
|
|
|
|
wxPanel *m_PageDirect3D;
|
|
|
|
wxPanel *m_PageEnhancements;
|
|
|
|
wxPanel *m_PageAdvanced;
|
|
|
|
|
|
|
|
//Direct3D Tab
|
|
|
|
wxStaticText* m_AdapterText;
|
|
|
|
wxChoice *m_AdapterCB;
|
|
|
|
wxArrayString arrayStringFor_AdapterCB;
|
|
|
|
wxArrayString arrayStringFor_MSAAModeCB;
|
|
|
|
wxCheckBox *m_VSync;
|
|
|
|
wxCheckBox *m_WidescreenHack;
|
|
|
|
wxStaticText* m_staticARText;
|
|
|
|
wxChoice *m_KeepAR;
|
|
|
|
wxStaticText* m_staticMSAAText;
|
|
|
|
wxChoice *m_MSAAModeCB;
|
|
|
|
wxStaticText* m_EFBScaleText;
|
|
|
|
wxChoice *m_EFBScaleMode;
|
|
|
|
wxCheckBox *m_EnableEFBAccess;
|
|
|
|
wxCheckBox *m_SafeTextureCache;
|
|
|
|
wxRadioButton *m_Radio_SafeTextureCache_Fast;
|
|
|
|
wxRadioButton *m_Radio_SafeTextureCache_Normal;
|
|
|
|
wxRadioButton *m_Radio_SafeTextureCache_Safe;
|
|
|
|
|
|
|
|
//Enhancements Tab
|
|
|
|
wxCheckBox *m_ForceFiltering;
|
|
|
|
wxCheckBox *m_MaxAnisotropy;
|
|
|
|
wxCheckBox *m_HiresTextures;
|
|
|
|
wxCheckBox *m_EFBScaledCopy;
|
|
|
|
|
|
|
|
//Advanced Tab
|
|
|
|
wxCheckBox *m_DisableFog;
|
|
|
|
wxCheckBox *m_OverlayFPS;
|
|
|
|
wxCheckBox *m_CopyEFB;
|
|
|
|
wxRadioButton *m_Radio_CopyEFBToRAM;
|
ok, here goes a really experimental commit:
replace efb to ram implementation by a hybrid approach.
explanation:
when copying from efb to texture, instead of make a copy to a texture or to the ram, copy the data to both, in hi quality to the texture and in native quality to the ram.
then instead of re-decoding the data from ram (very slow) use the data in the texture.
to improve this even more, test if the cpu has modified the data in the ram copy, if so, update the texture in memory and mark it as dynamic to avoid redundant work in future frames.
having all this implemented this is what is archived:
sms: full quality with scaled efb copies and fully functional goop cleaning :)
ztp: efb to texture speed with full map support.
nsmbw: this is a hard to emulate game, as it make a lot of shading and texture modification in cpu. it only have 35 fps in my system with new efb to ram but is 10 fps faster than normal efb to ram.
this game also show me another unimplemented feature, copy efb to multiple textures at the same time (is used to animate coins and other things in the world).
this is a remaining todo in efb to texture.
a lot of games should improve, so please test and let me know any regresion caused by this commit.
if everyone likes this the next step is, implement efb to multilpe textures and merge efb to ram and efb to texture.
then port to the other plugins.
enjoy.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5846 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-06 22:27:13 +00:00
|
|
|
wxCheckBox *m_VerifyTextureModification;
|
2010-06-13 19:41:07 +00:00
|
|
|
wxRadioButton *m_Radio_CopyEFBToGL;
|
|
|
|
wxCheckBox *m_EnableHotkeys;
|
|
|
|
wxCheckBox *m_WireFrame;
|
|
|
|
wxCheckBox *m_EnableXFB;
|
|
|
|
wxCheckBox *m_EnableRealXFB;
|
|
|
|
wxCheckBox *m_UseNativeMips;
|
|
|
|
wxCheckBox *m_DumpTextures;
|
|
|
|
wxCheckBox *m_DumpFrames;
|
|
|
|
wxCheckBox *m_OverlayStats;
|
|
|
|
wxCheckBox *m_ProjStats;
|
|
|
|
wxCheckBox *m_ShaderErrors;
|
|
|
|
wxCheckBox *m_TexfmtOverlay;
|
|
|
|
wxCheckBox *m_TexfmtCenter;
|
|
|
|
|
|
|
|
enum
|
|
|
|
{
|
|
|
|
ID_CLOSE,
|
|
|
|
ID_ADAPTER,
|
|
|
|
ID_VSYNC,
|
|
|
|
ID_WIDESCREEN_HACK,
|
|
|
|
ID_ASPECT,
|
|
|
|
ID_FULLSCREENRESOLUTION,
|
|
|
|
ID_ANTIALIASMODE,
|
|
|
|
ID_EFBSCALEMODE,
|
|
|
|
ID_EFB_ACCESS_ENABLE,
|
|
|
|
ID_SAFETEXTURECACHE,
|
|
|
|
ID_RADIO_SAFETEXTURECACHE_SAFE,
|
|
|
|
ID_RADIO_SAFETEXTURECACHE_NORMAL,
|
|
|
|
ID_RADIO_SAFETEXTURECACHE_FAST,
|
|
|
|
ID_FORCEFILTERING,
|
|
|
|
ID_FORCEANISOTROPY,
|
|
|
|
ID_LOADHIRESTEXTURES,
|
|
|
|
ID_EFBSCALEDCOPY,
|
|
|
|
ID_DISABLEFOG,
|
|
|
|
ID_OVERLAYFPS,
|
|
|
|
ID_ENABLEEFBCOPY,
|
|
|
|
ID_EFBTORAM,
|
ok, here goes a really experimental commit:
replace efb to ram implementation by a hybrid approach.
explanation:
when copying from efb to texture, instead of make a copy to a texture or to the ram, copy the data to both, in hi quality to the texture and in native quality to the ram.
then instead of re-decoding the data from ram (very slow) use the data in the texture.
to improve this even more, test if the cpu has modified the data in the ram copy, if so, update the texture in memory and mark it as dynamic to avoid redundant work in future frames.
having all this implemented this is what is archived:
sms: full quality with scaled efb copies and fully functional goop cleaning :)
ztp: efb to texture speed with full map support.
nsmbw: this is a hard to emulate game, as it make a lot of shading and texture modification in cpu. it only have 35 fps in my system with new efb to ram but is 10 fps faster than normal efb to ram.
this game also show me another unimplemented feature, copy efb to multiple textures at the same time (is used to animate coins and other things in the world).
this is a remaining todo in efb to texture.
a lot of games should improve, so please test and let me know any regresion caused by this commit.
if everyone likes this the next step is, implement efb to multilpe textures and merge efb to ram and efb to texture.
then port to the other plugins.
enjoy.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@5846 8ced0084-cf51-0410-be5f-012b33b47a6e
2010-07-06 22:27:13 +00:00
|
|
|
ID_VERIFYTEXTUREMODIFICATIONS,
|
2010-06-13 19:41:07 +00:00
|
|
|
ID_EFBTOTEX,
|
|
|
|
ID_ENABLEHOTKEY,
|
|
|
|
ID_WIREFRAME,
|
|
|
|
ID_ENABLEXFB,
|
|
|
|
ID_ENABLEREALXFB,
|
|
|
|
ID_USENATIVEMIPS,
|
|
|
|
ID_TEXDUMP,
|
|
|
|
ID_DUMPFRAMES,
|
|
|
|
ID_OVERLAYSTATS,
|
|
|
|
ID_PROJSTATS,
|
|
|
|
ID_SHADERERRORS,
|
|
|
|
ID_TEXFMT_OVERLAY,
|
|
|
|
ID_TEXFMT_CENTER,
|
|
|
|
ID_DEBUGSTEP,
|
|
|
|
ID_REGISTERS,
|
|
|
|
ID_ENABLEDEBUGGING,
|
|
|
|
ID_REGISTERSELECT,
|
|
|
|
ID_ARTEXT,
|
|
|
|
ID_NOTEBOOK = 1000,
|
|
|
|
ID_DEBUGGER,
|
|
|
|
ID_ABOUT,
|
|
|
|
ID_DIRERCT3D,
|
|
|
|
ID_PAGEENHANCEMENTS,
|
|
|
|
ID_PAGEADVANCED
|
|
|
|
};
|
|
|
|
void InitializeAdapters();
|
|
|
|
void OnClose(wxCloseEvent& event);
|
|
|
|
void InitializeGUIValues();
|
|
|
|
void DirectXSettingsChanged(wxCommandEvent& event);
|
|
|
|
void EnhancementsSettingsChanged(wxCommandEvent& event);
|
|
|
|
void AdvancedSettingsChanged(wxCommandEvent& event);
|
|
|
|
void CloseWindow();
|
|
|
|
void UpdateGUI();
|
|
|
|
|
|
|
|
};
|
|
|
|
#endif //_DX_DLGSETTINGS_H_
|