Remove SSAA checkbox and add SSAA to AA dropdown

The checkbox is removed, and the dropdown now looks like this:

None
2x MSAA
4x MSAA
8x MSAA
2x SSAA
4x SSAA
8x SSAA
This commit is contained in:
JosJuice
2015-11-05 22:50:20 +01:00
parent fd6b093a7e
commit a0b99cfc51
2 changed files with 56 additions and 33 deletions

View File

@ -193,7 +193,6 @@ protected:
// Anti-aliasing
choice_aamode->Enable(vconfig.backend_info.AAModes.size() > 1);
text_aamode->Enable(vconfig.backend_info.AAModes.size() > 1);
ssaa_checkbox->Enable(vconfig.backend_info.bSupportsSSAA && vconfig.iMultisampleMode > 0);
// XFB
@ -245,8 +244,8 @@ protected:
void Evt_LeaveControl(wxMouseEvent& ev);
void CreateDescriptionArea(wxPanel* const page, wxBoxSizer* const sizer);
void PopulatePostProcessingShaders();
void OnSSAAClick(wxCommandEvent& event);
void RefreshAAList();
void PopulateAAList();
void OnAAChanged(wxCommandEvent& ev);
wxChoice* choice_backend;
wxChoice* choice_adapter;
@ -256,8 +255,7 @@ protected:
wxStaticText* label_adapter;
wxStaticText* text_aamode;
SettingChoice* choice_aamode;
wxCheckBox* ssaa_checkbox;
wxChoice* choice_aamode;
wxStaticText* label_display_resolution;
@ -280,4 +278,6 @@ protected:
VideoConfig &vconfig;
std::string ininame;
int m_msaa_modes;
};