piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 13:20:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5418 from MerryMage/config-again-and-again

Browse Source 
VideoConfig: Port to layered configuration system
This commit is contained in:
shuffle2
2017-06-05 21:11:04 -07:00
committed by GitHub
parent 192fec50b9 b6a99e1b9c
commit c8166951a0
32 changed files with 961 additions and 591 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Source/UnitTests/Core/CoreTimingTest.cpp
View File

@ -7,6 +7,7 @@
#include <array>
#include <bitset>
#include "Core/Config/Config.h"
#include "Core/ConfigManager.h"
#include "Core/Core.h"
#include "Core/CoreTiming.h"
@ -36,6 +37,7 @@ public:
ScopeInit()
{
Core::DeclareAsCPUThread();
Config::Init();
SConfig::Init();
PowerPC::Init(PowerPC::CORE_INTERPRETER);
CoreTiming::Init();
@ -45,6 +47,7 @@ public:
CoreTiming::Shutdown();
PowerPC::Shutdown();
SConfig::Shutdown();
Config::Shutdown();
Core::UndeclareAsCPUThread();
}
};

3
Source/UnitTests/Core/MMIOTest.cpp
View File

@ -6,6 +6,7 @@
#include <unordered_set>
#include "Common/CommonTypes.h"
#include "Core/Config/Config.h"
#include "Core/HW/MMIO.h"
// Tests that the UniqueID function returns a "unique enough" identifier
@ -29,6 +30,7 @@ TEST(UniqueID, UniqueEnough)
TEST(IsMMIOAddress, SpecialAddresses)
{
Config::Init();
SConfig::Init();
SConfig::GetInstance().bWii = true;
@ -51,6 +53,7 @@ TEST(IsMMIOAddress, SpecialAddresses)
EXPECT_TRUE(MMIO::IsMMIOAddress(0x0D800F10)); // Mirror of Wii MMIOs
SConfig::Shutdown();
Config::Shutdown();
}
class MappingTest : public testing::Test