ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BPFunctions: Remove the rest of GetConfig

This commit is contained in:
Jasper St. Pierre 2014-05-03 15:10:19 -04:00
parent 08611c3f36
commit 833b7ee584
3 changed files with 3 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/Core/VideoCommon/BPFunctions.cpp
View File

@ -223,20 +223,6 @@ skip:
Renderer::StorePixelFormat(new_format); 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) void SetInterlacingMode(const BPCmd &bp)
{ {
// TODO // TODO

7
Source/Core/VideoCommon/BPFunctions.h
View File

@ -15,12 +15,6 @@
namespace BPFunctions namespace BPFunctions
{ {
enum
{
CONFIG_ISWII = 0,
CONFIG_SHOWEFBREGIONS
};
void FlushPipeline(); void FlushPipeline();
void SetGenerationMode(); void SetGenerationMode();
void SetScissor(); void SetScissor();
@ -34,6 +28,5 @@ void CopyEFB(u32 dstAddr, unsigned int dstFormat, PEControl::PixelFormat srcForm
const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf); const EFBRectangle& srcRect, bool isIntensity, bool scaleByHalf);
void ClearScreen(const EFBRectangle &rc); void ClearScreen(const EFBRectangle &rc);
void OnPixelFormatChange(); void OnPixelFormatChange();
bool GetConfig(const int &type);
void SetInterlacingMode(const BPCmd &bp); void SetInterlacingMode(const BPCmd &bp);
}; };

5
Source/Core/VideoCommon/BPStructs.cpp
View File

@ -5,6 +5,7 @@
#include <cmath> #include <cmath>
#include "Common/Thread.h" #include "Common/Thread.h"
#include "Core/Core.h"
#include "Core/HW/Memmap.h" #include "Core/HW/Memmap.h"
#include "VideoCommon/BPFunctions.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 // Check if we are to copy from the EFB or draw to the XFB
if (PE_copy.copy_to_xfb == 0) if (PE_copy.copy_to_xfb == 0)
{ {
if (GetConfig(CONFIG_SHOWEFBREGIONS)) if (g_ActiveConfig.bShowEFBCopyRegions)
stats.efb_regions.push_back(rc); stats.efb_regions.push_back(rc);
CopyEFB(bpmem.copyTexDest << 5, PE_copy.tp_realFormat(), CopyEFB(bpmem.copyTexDest << 5, PE_copy.tp_realFormat(),
@ -272,7 +273,7 @@ void BPWritten(const BPCmd& bp)
u8 *ptr = nullptr; u8 *ptr = nullptr;
// TODO - figure out a cleaner way. // TODO - figure out a cleaner way.
if (GetConfig(CONFIG_ISWII)) if (Core::g_CoreStartupParameter.bWii)
ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5); ptr = Memory::GetPointer(bpmem.tmem_config.tlut_src << 5);
else else
ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5); ptr = Memory::GetPointer((bpmem.tmem_config.tlut_src & 0xFFFFF) << 5);