diff --git a/Source/Core/DolphinLib.props b/Source/Core/DolphinLib.props
index e89d64c009..cba5345f77 100644
--- a/Source/Core/DolphinLib.props
+++ b/Source/Core/DolphinLib.props
@@ -476,6 +476,7 @@
+
diff --git a/Source/Core/InputCommon/CMakeLists.txt b/Source/Core/InputCommon/CMakeLists.txt
index 693c6b8c28..445fa5bbf3 100644
--- a/Source/Core/InputCommon/CMakeLists.txt
+++ b/Source/Core/InputCommon/CMakeLists.txt
@@ -64,6 +64,7 @@ add_library(inputcommon
ControlReference/FunctionExpression.h
DynamicInputTextures/DITConfiguration.cpp
DynamicInputTextures/DITConfiguration.h
+ DynamicInputTextures/DITData.h
)
target_link_libraries(inputcommon
diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
index 4af1796ddc..8cb5dd931d 100644
--- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.cpp
@@ -93,7 +93,7 @@ Configuration::Configuration(const std::string& json_file)
const auto output_textures = output_textures_json.get();
for (auto& [name, data] : output_textures)
{
- DynamicInputTextureData texture_data;
+ Data texture_data;
texture_data.m_hires_texture_name = name;
// Required fields
@@ -262,7 +262,7 @@ bool Configuration::GenerateTextures(const IniFile::Section* sec,
}
bool Configuration::GenerateTexture(const IniFile::Section* sec, const std::string& controller_name,
- const DynamicInputTextureData& texture_data) const
+ const Data& texture_data) const
{
std::string device_name;
if (!sec->Get("Device", &device_name))
diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
index 5bf16168fa..49e3a350f9 100644
--- a/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITConfiguration.h
@@ -10,7 +10,7 @@
#include "Common/CommonTypes.h"
#include "Common/IniFile.h"
-#include "InputCommon/ImageOperations.h"
+#include "InputCommon/DynamicInputTextures/DITData.h"
namespace InputCommon::DynamicInputTextures
{
@@ -22,24 +22,10 @@ public:
bool GenerateTextures(const IniFile::Section* sec, const std::string& controller_name) const;
private:
- struct DynamicInputTextureData
- {
- std::string m_image_name;
- std::string m_hires_texture_name;
- std::string m_generated_folder_name;
-
- using EmulatedKeyToRegionsMap = std::unordered_map>;
- std::unordered_map m_emulated_controllers;
-
- using HostKeyToImagePath = std::unordered_map;
- std::unordered_map m_host_devices;
- bool m_preserve_aspect_ratio = true;
- };
-
bool GenerateTexture(const IniFile::Section* sec, const std::string& controller_name,
- const DynamicInputTextureData& texture_data) const;
+ const Data& texture_data) const;
- std::vector m_dynamic_input_textures;
+ std::vector m_dynamic_input_textures;
std::string m_base_path;
bool m_valid = true;
};
diff --git a/Source/Core/InputCommon/DynamicInputTextures/DITData.h b/Source/Core/InputCommon/DynamicInputTextures/DITData.h
new file mode 100644
index 0000000000..b0c14a9bfb
--- /dev/null
+++ b/Source/Core/InputCommon/DynamicInputTextures/DITData.h
@@ -0,0 +1,28 @@
+// Copyright 2021 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+#pragma once
+
+#include
+#include
+#include
+
+#include "InputCommon/ImageOperations.h"
+
+namespace InputCommon::DynamicInputTextures
+{
+struct Data
+{
+ std::string m_image_name;
+ std::string m_hires_texture_name;
+ std::string m_generated_folder_name;
+
+ using EmulatedKeyToRegionsMap = std::unordered_map>;
+ std::unordered_map m_emulated_controllers;
+
+ using HostKeyToImagePath = std::unordered_map;
+ std::unordered_map m_host_devices;
+ bool m_preserve_aspect_ratio = true;
+};
+} // namespace InputCommon::DynamicInputTextures