diff --git a/Source/Core/VideoCommon/BPFunctions.cpp b/Source/Core/VideoCommon/BPFunctions.cpp index 89ace7baa5..a5cb6d9f66 100644 --- a/Source/Core/VideoCommon/BPFunctions.cpp +++ b/Source/Core/VideoCommon/BPFunctions.cpp @@ -223,20 +223,6 @@ skip: Renderer::StorePixelFormat(new_format); } -bool GetConfig(const int &type) -{ - switch (type) - { - case CONFIG_ISWII: - return SConfig::GetInstance().m_LocalCoreStartupParameter.bWii; - case CONFIG_SHOWEFBREGIONS: - return g_ActiveConfig.bShowEFBCopyRegions; - default: - PanicAlert("GetConfig Error: Unknown Config Type!"); - return false; - } -} - void SetInterlacingMode(const BPCmd &bp) { // TODO diff --git a/Source/Core/VideoCommon/BPFunctions.h b/Source/Core/VideoCommon/BPFunctions.h index 888b469203..f6df86c6a0 100644 --- a/Source/Core/VideoCommon/BPFunctions.h +++ b/Source/Core/VideoCommon/BPFunctions.h @@ -15,12 +15,6 @@ namespace BPFunctions { -enum -{ - CONFIG_ISWII = 0, - CONFIG_SHOWEFBREGIONS -}; - void FlushPipeline(); void SetGenerationMode(); void SetScissor(); @@ -34,6 +28,5 @@ void CopyEFB(u32 dstAddr, unsigned int dstFormat, PEControl::PixelFormat srcForm const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf); void ClearScreen(const EFBRectangle &rc); void OnPixelFormatChange(); -bool GetConfig(const int &type); void SetInterlacingMode(const BPCmd &bp); }; diff --git a/Source/Core/VideoCommon/BPStructs.cpp b/Source/Core/VideoCommon/BPStructs.cpp index 0194eb4ca7..d7d7210307 100644 --- a/Source/Core/VideoCommon/BPStructs.cpp +++ b/Source/Core/VideoCommon/BPStructs.cpp @@ -5,6 +5,7 @@ #include #include "Common/Thread.h" +#include "Core/Core.h" #include "Core/HW/Memmap.h" #include "VideoCommon/BPFunctions.h" @@ -219,7 +220,7 @@ void BPWritten(const BPCmd& bp) // Check if we are to copy from the EFB or draw to the XFB if (PE_copy.copy_to_xfb == 0) { - if (GetConfig(CONFIG_SHOWEFBREGIONS)) + if (g_ActiveConfig.bShowEFBCopyRegions) stats.efb_regions.push_back(rc); CopyEFB(bpmem.copyTexDest << 5, PE_copy.tp_realFormat(), @@ -272,7 +273,7 @@ void BPWritten(const BPCmd& bp) u8 *ptr = nullptr; // TODO - figure out a cleaner way. - if (GetConfig(CONFIG_ISWII)) + if (Core::g_CoreStartupParameter.bWii) ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5); else ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5);