diff --git a/Source/Core/Core/Movie.cpp b/Source/Core/Core/Movie.cpp index 09f0700e7b..c28e4773ce 100644 --- a/Source/Core/Core/Movie.cpp +++ b/Source/Core/Core/Movie.cpp @@ -1211,7 +1211,7 @@ void SaveRecording(const std::string& filename) strncpy((char *)header.videoBackend, s_videoBackend.c_str(),ArraySize(header.videoBackend)); header.CPUCore = s_iCPUCore; header.bEFBAccessEnable = g_ActiveConfig.bEFBAccessEnable; - header.bEFBCopyEnable = g_ActiveConfig.bEFBCopyEnable; + header.bEFBCopyEnable = true; header.bCopyEFBToTexture = g_ActiveConfig.bCopyEFBToTexture; header.bEFBCopyCacheEnable = false; header.bEFBEmulateFormatChanges = g_ActiveConfig.bEFBEmulateFormatChanges; @@ -1273,7 +1273,6 @@ void CallWiiInputManip(u8* data, WiimoteEmu::ReportFeatures rptf, int controller void SetGraphicsConfig() { g_Config.bEFBAccessEnable = tmpHeader.bEFBAccessEnable; - g_Config.bEFBCopyEnable = tmpHeader.bEFBCopyEnable; g_Config.bCopyEFBToTexture = tmpHeader.bCopyEFBToTexture; g_Config.bEFBEmulateFormatChanges = tmpHeader.bEFBEmulateFormatChanges; g_Config.bUseXFB = tmpHeader.bUseXFB; diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 75ce7aaf4c..7d8249273e 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1344,14 +1344,7 @@ void CFrame::ParseHotkeys(wxKeyEvent &event) { OSDChoice = 3; // Toggle EFB copies between EFB2RAM and EFB2Texture - if (!g_Config.bEFBCopyEnable) - { - OSD::AddMessage("EFB Copies are disabled, enable them in Graphics settings for toggling", 6000); - } - else - { - g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; - } + g_Config.bCopyEFBToTexture = !g_Config.bCopyEFBToTexture; } else if (IsHotkey(event, HK_TOGGLE_FOG)) { diff --git a/Source/Core/DolphinWX/VideoConfigDiag.cpp b/Source/Core/DolphinWX/VideoConfigDiag.cpp index e90c5483ef..6e6a0090b0 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.cpp +++ b/Source/Core/DolphinWX/VideoConfigDiag.cpp @@ -482,14 +482,8 @@ VideoConfigDiag::VideoConfigDiag(wxWindow* parent, const std::string &title, con // EFB copies wxStaticBoxSizer* const group_efbcopy = new wxStaticBoxSizer(wxHORIZONTAL, page_hacks, _("EFB Copies")); - SettingCheckBox* efbcopy_disable = CreateCheckBox(page_hacks, _("Disable"), wxGetTranslation(efb_copy_desc), vconfig.bEFBCopyEnable, true); - efbcopy_texture = CreateRadioButton(page_hacks, _("Texture"), wxGetTranslation(efb_copy_texture_desc), vconfig.bCopyEFBToTexture, false, wxRB_GROUP); - efbcopy_ram = CreateRadioButton(page_hacks, _("RAM"), wxGetTranslation(efb_copy_ram_desc), vconfig.bCopyEFBToTexture, true); - - group_efbcopy->Add(efbcopy_disable, 0, wxLEFT | wxRIGHT | wxBOTTOM, 5); - group_efbcopy->AddStretchSpacer(1); - group_efbcopy->Add(efbcopy_texture, 0, wxRIGHT, 5); - group_efbcopy->Add(efbcopy_ram, 0, wxRIGHT, 5); + group_efbcopy->Add(CreateRadioButton(page_hacks, _("Texture"), wxGetTranslation(efb_copy_texture_desc), vconfig.bCopyEFBToTexture, false, wxRB_GROUP), 0, wxRIGHT, 5); + group_efbcopy->Add(CreateRadioButton(page_hacks, _("RAM"), wxGetTranslation(efb_copy_ram_desc), vconfig.bCopyEFBToTexture, true), 0, wxRIGHT, 5); szr_efb->Add(CreateCheckBox(page_hacks, _("Skip EFB Access from CPU"), wxGetTranslation(efb_access_desc), vconfig.bEFBAccessEnable, true), 0, wxBOTTOM | wxLEFT, 5); szr_efb->Add(CreateCheckBox(page_hacks, _("Ignore Format Changes"), wxGetTranslation(efb_emulate_format_changes_desc), vconfig.bEFBEmulateFormatChanges, true), 0, wxBOTTOM | wxLEFT, 5); diff --git a/Source/Core/DolphinWX/VideoConfigDiag.h b/Source/Core/DolphinWX/VideoConfigDiag.h index 4f54eb214c..a16e12c572 100644 --- a/Source/Core/DolphinWX/VideoConfigDiag.h +++ b/Source/Core/DolphinWX/VideoConfigDiag.h @@ -200,10 +200,6 @@ protected: choice_aamode->Enable(vconfig.backend_info.AAModes.size() > 1); text_aamode->Enable(vconfig.backend_info.AAModes.size() > 1); - // EFB copy - efbcopy_texture->Enable(vconfig.bEFBCopyEnable); - efbcopy_ram->Enable(vconfig.bEFBCopyEnable); - // XFB virtual_xfb->Enable(vconfig.bUseXFB); real_xfb->Enable(vconfig.bUseXFB); @@ -268,9 +264,6 @@ protected: SettingCheckBox* borderless_fullscreen; SettingCheckBox* render_to_main_checkbox; - SettingRadioButton* efbcopy_texture; - SettingRadioButton* efbcopy_ram; - SettingRadioButton* virtual_xfb; SettingRadioButton* real_xfb; diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp index 604840efdd..748f1c269e 100644 --- a/Source/Core/VideoCommon/BPFunctions.cpp +++ b/Source/Core/VideoCommon/BPFunctions.cpp @@ -90,11 +90,8 @@ void CopyEFB(u32 dstAddr, const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf) { // bpmem.zcontrol.pixel_format to PEControl::Z24 is when the game wants to copy from ZBuffer (Zbuffer uses 24-bit Format) - if (g_ActiveConfig.bEFBCopyEnable) - { - TextureCache::CopyRenderTargetToTexture(dstAddr, dstFormat, srcFormat, - srcRect, isIntensity, scaleByHalf); - } + TextureCache::CopyRenderTargetToTexture(dstAddr, dstFormat, srcFormat, + srcRect, isIntensity, scaleByHalf); } /* Explanation of the magic behind ClearScreen: diff --git a/Source/Core/VideoCommon/RenderBase.cpp b/Source/Core/VideoCommon/RenderBase.cpp index ccceb954dd..8656ba621c 100644 --- a/Source/Core/VideoCommon/RenderBase.cpp +++ b/Source/Core/VideoCommon/RenderBase.cpp @@ -375,8 +375,7 @@ void Renderer::DrawDebugText() break; } - const char* const efbcopy_text = g_ActiveConfig.bEFBCopyEnable ? - (g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM") : "Disabled"; + const char* const efbcopy_text = g_ActiveConfig.bCopyEFBToTexture ? "to Texture" : "to RAM"; // The rows const std::string lines[] = diff --git a/Source/Core/VideoCommon/VideoConfig.cpp b/Source/Core/VideoCommon/VideoConfig.cpp index ef5fe26798..e0b91c198c 100644 --- a/Source/Core/VideoCommon/VideoConfig.cpp +++ b/Source/Core/VideoCommon/VideoConfig.cpp @@ -97,7 +97,6 @@ void VideoConfig::Load(const std::string& ini_file) IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks"); hacks->Get("EFBAccessEnable", &bEFBAccessEnable, true); - hacks->Get("EFBCopyEnable", &bEFBCopyEnable, true); hacks->Get("EFBToTextureEnable", &bCopyEFBToTexture, true); hacks->Get("EFBScaledCopy", &bCopyEFBScaled, true); hacks->Get("EFBEmulateFormatChanges", &bEFBEmulateFormatChanges, false); @@ -197,7 +196,6 @@ void VideoConfig::GameIniLoad() CHECK_SETTING("Video_Stereoscopy", "StereoConvergenceMinimum", iStereoConvergenceMinimum); CHECK_SETTING("Video_Hacks", "EFBAccessEnable", bEFBAccessEnable); - CHECK_SETTING("Video_Hacks", "EFBCopyEnable", bEFBCopyEnable); CHECK_SETTING("Video_Hacks", "EFBToTextureEnable", bCopyEFBToTexture); CHECK_SETTING("Video_Hacks", "EFBScaledCopy", bCopyEFBScaled); CHECK_SETTING("Video_Hacks", "EFBEmulateFormatChanges", bEFBEmulateFormatChanges); @@ -285,7 +283,6 @@ void VideoConfig::Save(const std::string& ini_file) IniFile::Section* hacks = iniFile.GetOrCreateSection("Hacks"); hacks->Set("EFBAccessEnable", bEFBAccessEnable); - hacks->Set("EFBCopyEnable", bEFBCopyEnable); hacks->Set("EFBToTextureEnable", bCopyEFBToTexture); hacks->Set("EFBScaledCopy", bCopyEFBScaled); hacks->Set("EFBEmulateFormatChanges", bEFBEmulateFormatChanges); diff --git a/Source/Core/VideoCommon/VideoConfig.h b/Source/Core/VideoCommon/VideoConfig.h index 760a068c0f..0386e9e312 100644 --- a/Source/Core/VideoCommon/VideoConfig.h +++ b/Source/Core/VideoCommon/VideoConfig.h @@ -113,7 +113,6 @@ struct VideoConfig final bool bEFBAccessEnable; bool bPerfQueriesEnable; - bool bEFBCopyEnable; bool bEFBEmulateFormatChanges; bool bCopyEFBToTexture; bool bCopyEFBScaled; @@ -165,8 +164,8 @@ struct VideoConfig final // Utility bool RealXFBEnabled() const { return bUseXFB && bUseRealXFB; } bool VirtualXFBEnabled() const { return bUseXFB && !bUseRealXFB; } - bool EFBCopiesToTextureEnabled() const { return bEFBCopyEnable && bCopyEFBToTexture; } - bool EFBCopiesToRamEnabled() const { return bEFBCopyEnable && !bCopyEFBToTexture; } + bool EFBCopiesToTextureEnabled() const { return bCopyEFBToTexture; } + bool EFBCopiesToRamEnabled() const { return !bCopyEFBToTexture; } bool ExclusiveFullscreenEnabled() const { return backend_info.bSupportsExclusiveFullscreen && !bBorderlessFullscreen; } };