mirror of https://github.com/PCSX2/pcsx2.git
gsdx: Remove remaining MSAA ui code
We are removing MSAA for the following reasons: 1. It's broken 2. Fixing it would mean it would perform as well as FSAA, which defeats the purpose of having it 3. It's only supported by DX and Windows 4. Reduction in code complexity Press F to pay respect
This commit is contained in:
Kojin
lightningterror
parent
e429677a07
commit
5fe1cab889
|
|
@ -439,7 +439,6 @@ void GSdxApp::Init()
|
|||
m_default_configuration["UserHacks_CPU_FB_Conversion"] = "0";
|
||||
m_default_configuration["UserHacks_HalfPixelOffset"] = "0";
|
||||
m_default_configuration["UserHacks_merge_pp_sprite"] = "0";
|
||||
m_default_configuration["UserHacks_MSAA"] = "0";
|
||||
m_default_configuration["UserHacks_round_sprite_offset"] = "0";
|
||||
m_default_configuration["UserHacks_SkipDraw"] = "0";
|
||||
m_default_configuration["UserHacks_SkipDraw_Offset"] = "0";
|
||||
|
|
|
|||
|
|
@ -138,8 +138,6 @@ BEGIN
|
|||
CONTROL "Wild Arms Offset",IDC_WILDHACK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,108,84,70,8
|
||||
// Columns end
|
||||
//
|
||||
RTEXT "MSAA:",IDC_MSAA_TEXT,54,99,22,8
|
||||
COMBOBOX IDC_MSAACB,80,96,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "Trilinear Filtering:",IDC_TRI_FILTER_TEXT,16,114,60,8
|
||||
COMBOBOX IDC_TRI_FILTER,80,111,116,63,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
|
||||
RTEXT "Half-pixel Offset:",IDC_OFFSETHACK_TEXT,14,129,62,8
|
||||
|
|
|
|||
|
|
@ -702,7 +702,6 @@ bool RunLinuxDialog()
|
|||
int mode_height = theApp.GetConfigI("ModeHeight");
|
||||
theApp.SetConfig("ModeHeight", mode_height);
|
||||
theApp.SetConfig("ModeWidth", mode_width);
|
||||
theApp.SetConfig("msaa", 0);
|
||||
theApp.SetConfig("windowed", 1);
|
||||
|
||||
gtk_widget_destroy (dialog);
|
||||
|
|
|
|||
|
|
@ -77,9 +77,6 @@ const char* dialog_message(int ID, bool* updateText) {
|
|||
case IDC_WILDHACK:
|
||||
return "Lowers the GS precision to avoid gaps between pixels when upscaling.\n"
|
||||
"Fixes the text on Wild Arms games.";
|
||||
case IDC_MSAACB:
|
||||
return "Enables hardware Anti-Aliasing. Needs lots of memory.\n\n"
|
||||
"Note: MSAA often causes graphical glitches.";
|
||||
case IDC_ALPHASTENCIL:
|
||||
return "Extend stencil based emulation of destination alpha to perform stencil operations while drawing.\n\n"
|
||||
"Improves many shadows which are normally overdrawn in parts, may affect other effects.\n"
|
||||
|
|
|
|||
|
|
@ -52,7 +52,6 @@ enum {
|
|||
IDC_OFFSETHACK,
|
||||
IDC_SPRITEHACK,
|
||||
IDC_WILDHACK,
|
||||
IDC_MSAACB,
|
||||
IDC_ALPHASTENCIL,
|
||||
IDC_ALIGN_SPRITE,
|
||||
IDC_ROUND_SPRITE,
|
||||
|
|
|
|||
|
|
@ -596,8 +596,6 @@ bool GSShaderDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
|
|||
|
||||
GSHacksDlg::GSHacksDlg(const std::string &adapter_id)
|
||||
: GSDialog{IDD_HACKS}
|
||||
, cb2msaa{}
|
||||
, msaa2cb{}
|
||||
, m_adapter_id(adapter_id)
|
||||
, m_old_skipdraw_offset{0}
|
||||
, m_old_skipdraw{0}
|
||||
|
|
@ -615,21 +613,6 @@ void GSHacksDlg::OnInit()
|
|||
bool ogl = renderer == GSRendererType::OGL_HW;
|
||||
bool native = upscaling_multiplier == 1;
|
||||
|
||||
for(unsigned short j = 0; j < 5; j++) // TODO: Make the same kind of check for d3d11, eventually....
|
||||
{
|
||||
unsigned short i = j == 0 ? 0 : 1 << j;
|
||||
|
||||
msaa2cb[i] = j;
|
||||
cb2msaa[j] = i;
|
||||
|
||||
char text[32] = {0};
|
||||
sprintf(text, "%dx ", i);
|
||||
|
||||
SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_ADDSTRING, 0, (LPARAM)text);
|
||||
}
|
||||
|
||||
SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_SETCURSEL, msaa2cb[std::min(theApp.GetConfigI("UserHacks_MSAA"), 16)], 0);
|
||||
|
||||
CheckDlgButton(m_hWnd, IDC_ALPHAHACK, theApp.GetConfigB("UserHacks_AlphaHack"));
|
||||
CheckDlgButton(m_hWnd, IDC_WILDHACK, theApp.GetConfigI("UserHacks_WildHack"));
|
||||
CheckDlgButton(m_hWnd, IDC_ALPHASTENCIL, theApp.GetConfigB("UserHacks_AlphaStencil"));
|
||||
|
|
@ -686,10 +669,6 @@ void GSHacksDlg::OnInit()
|
|||
EnableWindow(GetDlgItem(m_hWnd, IDC_IMAGE_LOAD_STORE), ogl);
|
||||
EnableWindow(GetDlgItem(m_hWnd, IDC_IMAGE_LOAD_STORE_TEXT), ogl);
|
||||
|
||||
// FIXME: Temporarily disabled:
|
||||
ShowWindow(GetDlgItem(m_hWnd, IDC_MSAACB), SW_HIDE);
|
||||
ShowWindow(GetDlgItem(m_hWnd, IDC_MSAA_TEXT), SW_HIDE);
|
||||
|
||||
AddTooltip(IDC_SKIPDRAWHACKEDIT);
|
||||
AddTooltip(IDC_SKIPDRAWHACK);
|
||||
AddTooltip(IDC_SKIPDRAWOFFSETEDIT);
|
||||
|
|
@ -698,7 +677,6 @@ void GSHacksDlg::OnInit()
|
|||
AddTooltip(IDC_OFFSETHACK);
|
||||
AddTooltip(IDC_SPRITEHACK);
|
||||
AddTooltip(IDC_WILDHACK);
|
||||
AddTooltip(IDC_MSAACB);
|
||||
AddTooltip(IDC_ALPHASTENCIL);
|
||||
AddTooltip(IDC_ALIGN_SPRITE);
|
||||
AddTooltip(IDC_ROUND_SPRITE);
|
||||
|
|
@ -801,7 +779,6 @@ bool GSHacksDlg::OnMessage(UINT message, WPARAM wParam, LPARAM lParam)
|
|||
theApp.SetConfig("UserHacks_SkipDraw_Offset", std::min(skipdraw_offset, skipdraw));
|
||||
theApp.SetConfig("UserHacks_SkipDraw", skipdraw);
|
||||
|
||||
theApp.SetConfig("UserHacks_MSAA", cb2msaa[(int)SendMessage(GetDlgItem(m_hWnd, IDC_MSAACB), CB_GETCURSEL, 0, 0)]);
|
||||
theApp.SetConfig("UserHacks_AlphaHack", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHAHACK));
|
||||
theApp.SetConfig("UserHacks_WildHack", (int)IsDlgButtonChecked(m_hWnd, IDC_WILDHACK));
|
||||
theApp.SetConfig("UserHacks_AlphaStencil", (int)IsDlgButtonChecked(m_hWnd, IDC_ALPHASTENCIL));
|
||||
|
|
|
|||
|
|
@ -42,8 +42,6 @@ public:
|
|||
|
||||
class GSHacksDlg : public GSDialog
|
||||
{
|
||||
unsigned short cb2msaa[17];
|
||||
unsigned short msaa2cb[17];
|
||||
std::string m_adapter_id;
|
||||
int m_old_skipdraw_offset;
|
||||
int m_old_skipdraw;
|
||||
|
|
|
|||
|
|
@ -77,8 +77,6 @@
|
|||
#define IDC_OFFSETHACK_TEXT 2103
|
||||
#define IDC_SPRITEHACK 2106
|
||||
#define IDC_SPRITEHACK_TEXT 2107
|
||||
#define IDC_MSAACB 2108
|
||||
#define IDC_MSAA_TEXT 2109
|
||||
#define IDC_ALPHASTENCIL 2110
|
||||
#define IDC_TCOFFSETX 2111
|
||||
#define IDC_TCOFFSETX2 2112
|
||||
|
|
|
|||
Loading…
Reference in New Issue