summaryrefslogtreecommitdiff
path: root/Source/Core
diff options
context:
space:
mode:
authorDentomologist <dentomologist@gmail.com>2025-09-23 14:42:59 -0700
committerDentomologist <dentomologist@gmail.com>2025-10-13 17:38:20 -0700
commit5b4df5ae98494a74e954b7866df1eb4384a81641 (patch)
tree1cff9edbaa726a8502b7fda445d760d67ac444a8 /Source/Core
parente0e2c7461bea830ff9010115562b50f47a7108b8 (diff)
VideoBackend: Rename GetName to GetConfigName
Make the function name more explicit and a better match for GetDisplayName. Change NAME to CONFIG_NAME while I'm at it.
Diffstat (limited to 'Source/Core')
-rw-r--r--Source/Core/Core/DolphinAnalytics.cpp2
-rw-r--r--Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp2
-rw-r--r--Source/Core/VideoBackends/D3D/D3DMain.cpp4
-rw-r--r--Source/Core/VideoBackends/D3D/VideoBackend.h4
-rw-r--r--Source/Core/VideoBackends/D3D12/VideoBackend.cpp4
-rw-r--r--Source/Core/VideoBackends/D3D12/VideoBackend.h4
-rw-r--r--Source/Core/VideoBackends/Metal/MTLMain.mm4
-rw-r--r--Source/Core/VideoBackends/Metal/VideoBackend.h4
-rw-r--r--Source/Core/VideoBackends/Null/VideoBackend.h4
-rw-r--r--Source/Core/VideoBackends/OGL/OGLMain.cpp4
-rw-r--r--Source/Core/VideoBackends/OGL/VideoBackend.h4
-rw-r--r--Source/Core/VideoBackends/Software/SWmain.cpp4
-rw-r--r--Source/Core/VideoBackends/Software/VideoBackend.h4
-rw-r--r--Source/Core/VideoBackends/Vulkan/VideoBackend.h4
-rw-r--r--Source/Core/VideoCommon/VideoBackendBase.cpp6
-rw-r--r--Source/Core/VideoCommon/VideoBackendBase.h4
16 files changed, 31 insertions, 31 deletions
diff --git a/Source/Core/Core/DolphinAnalytics.cpp b/Source/Core/Core/DolphinAnalytics.cpp
index 3a1e569a88..2d6b78429c 100644
--- a/Source/Core/Core/DolphinAnalytics.cpp
+++ b/Source/Core/Core/DolphinAnalytics.cpp
@@ -370,7 +370,7 @@ void DolphinAnalytics::MakePerGameBuilder()
builder.AddData("cfg-render-to-main", Config::Get(Config::MAIN_RENDER_TO_MAIN));
if (g_video_backend)
{
- builder.AddData("cfg-video-backend", g_video_backend->GetName());
+ builder.AddData("cfg-video-backend", g_video_backend->GetConfigName());
}
// Video configuration.
diff --git a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
index 0ffc29cda9..15d25167dc 100644
--- a/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
+++ b/Source/Core/DolphinQt/Config/Graphics/GeneralWidget.cpp
@@ -57,7 +57,7 @@ void GeneralWidget::CreateWidgets()
for (auto& backend : VideoBackendBase::GetAvailableBackends())
{
options.push_back(std::make_pair(tr(backend->GetDisplayName().c_str()),
- QString::fromStdString(backend->GetName())));
+ QString::fromStdString(backend->GetConfigName())));
}
m_backend_combo = new ConfigStringChoice(options, Config::MAIN_GFX_BACKEND, m_game_layer);
m_previous_backend = m_backend_combo->currentIndex();
diff --git a/Source/Core/VideoBackends/D3D/D3DMain.cpp b/Source/Core/VideoBackends/D3D/D3DMain.cpp
index c6803057e3..2e09dd82cb 100644
--- a/Source/Core/VideoBackends/D3D/D3DMain.cpp
+++ b/Source/Core/VideoBackends/D3D/D3DMain.cpp
@@ -28,9 +28,9 @@
namespace DX11
{
-std::string VideoBackend::GetName() const
+std::string VideoBackend::GetConfigName() const
{
- return NAME;
+ return CONFIG_NAME;
}
std::string VideoBackend::GetDisplayName() const
diff --git a/Source/Core/VideoBackends/D3D/VideoBackend.h b/Source/Core/VideoBackends/D3D/VideoBackend.h
index 6a94f8c7a3..ae25848105 100644
--- a/Source/Core/VideoBackends/D3D/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D/VideoBackend.h
@@ -14,13 +14,13 @@ public:
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override;
+ std::string GetConfigName() const override;
std::string GetDisplayName() const override;
std::optional<std::string> GetWarningMessage() const override;
void InitBackendInfo(const WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "D3D";
+ static constexpr const char* CONFIG_NAME = "D3D";
private:
void FillBackendInfo();
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
index 25e092afa2..a5659642c9 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.cpp
@@ -26,9 +26,9 @@
namespace DX12
{
-std::string VideoBackend::GetName() const
+std::string VideoBackend::GetConfigName() const
{
- return NAME;
+ return CONFIG_NAME;
}
std::string VideoBackend::GetDisplayName() const
diff --git a/Source/Core/VideoBackends/D3D12/VideoBackend.h b/Source/Core/VideoBackends/D3D12/VideoBackend.h
index 6167833c94..7be8291bcd 100644
--- a/Source/Core/VideoBackends/D3D12/VideoBackend.h
+++ b/Source/Core/VideoBackends/D3D12/VideoBackend.h
@@ -15,11 +15,11 @@ public:
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override;
+ std::string GetConfigName() const override;
std::string GetDisplayName() const override;
void InitBackendInfo(const WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "D3D12";
+ static constexpr const char* CONFIG_NAME = "D3D12";
private:
void FillBackendInfo();
diff --git a/Source/Core/VideoBackends/Metal/MTLMain.mm b/Source/Core/VideoBackends/Metal/MTLMain.mm
index bcb031f843..ff8480edda 100644
--- a/Source/Core/VideoBackends/Metal/MTLMain.mm
+++ b/Source/Core/VideoBackends/Metal/MTLMain.mm
@@ -29,9 +29,9 @@
#include "VideoCommon/VideoCommon.h"
#include "VideoCommon/VideoConfig.h"
-std::string Metal::VideoBackend::GetName() const
+std::string Metal::VideoBackend::GetConfigName() const
{
- return NAME;
+ return CONFIG_NAME;
}
std::string Metal::VideoBackend::GetDisplayName() const
diff --git a/Source/Core/VideoBackends/Metal/VideoBackend.h b/Source/Core/VideoBackends/Metal/VideoBackend.h
index a6a24173e5..008b5f824e 100644
--- a/Source/Core/VideoBackends/Metal/VideoBackend.h
+++ b/Source/Core/VideoBackends/Metal/VideoBackend.h
@@ -14,7 +14,7 @@ public:
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override;
+ std::string GetConfigName() const override;
std::string GetDisplayName() const override;
std::optional<std::string> GetWarningMessage() const override;
@@ -22,6 +22,6 @@ public:
void PrepareWindow(WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "Metal";
+ static constexpr const char* CONFIG_NAME = "Metal";
};
} // namespace Metal
diff --git a/Source/Core/VideoBackends/Null/VideoBackend.h b/Source/Core/VideoBackends/Null/VideoBackend.h
index 4437c0c48d..5ced7951a2 100644
--- a/Source/Core/VideoBackends/Null/VideoBackend.h
+++ b/Source/Core/VideoBackends/Null/VideoBackend.h
@@ -13,10 +13,10 @@ public:
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override { return NAME; }
+ std::string GetConfigName() const override { return CONFIG_NAME; }
std::string GetDisplayName() const override;
void InitBackendInfo(const WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "Null";
+ static constexpr const char* CONFIG_NAME = "Null";
};
} // namespace Null
diff --git a/Source/Core/VideoBackends/OGL/OGLMain.cpp b/Source/Core/VideoBackends/OGL/OGLMain.cpp
index 92dd021e3e..e47eaaf940 100644
--- a/Source/Core/VideoBackends/OGL/OGLMain.cpp
+++ b/Source/Core/VideoBackends/OGL/OGLMain.cpp
@@ -61,9 +61,9 @@ Make AA apply instantly during gameplay if possible
namespace OGL
{
-std::string VideoBackend::GetName() const
+std::string VideoBackend::GetConfigName() const
{
- return NAME;
+ return CONFIG_NAME;
}
std::string VideoBackend::GetDisplayName() const
diff --git a/Source/Core/VideoBackends/OGL/VideoBackend.h b/Source/Core/VideoBackends/OGL/VideoBackend.h
index 53f7f940d5..734748a74a 100644
--- a/Source/Core/VideoBackends/OGL/VideoBackend.h
+++ b/Source/Core/VideoBackends/OGL/VideoBackend.h
@@ -16,12 +16,12 @@ public:
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override;
+ std::string GetConfigName() const override;
std::string GetDisplayName() const override;
void InitBackendInfo(const WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "OGL";
+ static constexpr const char* CONFIG_NAME = "OGL";
private:
bool InitializeGLExtensions(GLContext* context);
diff --git a/Source/Core/VideoBackends/Software/SWmain.cpp b/Source/Core/VideoBackends/Software/SWmain.cpp
index 51c714ad2d..2f51789ae4 100644
--- a/Source/Core/VideoBackends/Software/SWmain.cpp
+++ b/Source/Core/VideoBackends/Software/SWmain.cpp
@@ -38,9 +38,9 @@ public:
bool IsFlushed() const override { return true; }
};
-std::string VideoSoftware::GetName() const
+std::string VideoSoftware::GetConfigName() const
{
- return NAME;
+ return CONFIG_NAME;
}
std::string VideoSoftware::GetDisplayName() const
diff --git a/Source/Core/VideoBackends/Software/VideoBackend.h b/Source/Core/VideoBackends/Software/VideoBackend.h
index 35c3adb1a7..5fa4127916 100644
--- a/Source/Core/VideoBackends/Software/VideoBackend.h
+++ b/Source/Core/VideoBackends/Software/VideoBackend.h
@@ -13,12 +13,12 @@ class VideoSoftware : public VideoBackendBase
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override;
+ std::string GetConfigName() const override;
std::string GetDisplayName() const override;
std::optional<std::string> GetWarningMessage() const override;
void InitBackendInfo(const WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "Software Renderer";
+ static constexpr const char* CONFIG_NAME = "Software Renderer";
};
} // namespace SW
diff --git a/Source/Core/VideoBackends/Vulkan/VideoBackend.h b/Source/Core/VideoBackends/Vulkan/VideoBackend.h
index 4e8c3a5471..2f4187d61b 100644
--- a/Source/Core/VideoBackends/Vulkan/VideoBackend.h
+++ b/Source/Core/VideoBackends/Vulkan/VideoBackend.h
@@ -14,11 +14,11 @@ public:
bool Initialize(const WindowSystemInfo& wsi) override;
void Shutdown() override;
- std::string GetName() const override { return NAME; }
+ std::string GetConfigName() const override { return CONFIG_NAME; }
std::string GetDisplayName() const override { return _trans("Vulkan"); }
void InitBackendInfo(const WindowSystemInfo& wsi) override;
void PrepareWindow(WindowSystemInfo& wsi) override;
- static constexpr const char* NAME = "Vulkan";
+ static constexpr const char* CONFIG_NAME = "Vulkan";
};
} // namespace Vulkan
diff --git a/Source/Core/VideoCommon/VideoBackendBase.cpp b/Source/Core/VideoCommon/VideoBackendBase.cpp
index 37bfb0e37f..d964eac3f9 100644
--- a/Source/Core/VideoCommon/VideoBackendBase.cpp
+++ b/Source/Core/VideoCommon/VideoBackendBase.cpp
@@ -86,7 +86,7 @@ __declspec(dllexport) int AmdPowerXpressRequestHighPerformance = 1;
std::string VideoBackendBase::BadShaderFilename(const char* shader_stage, int counter)
{
return fmt::format("{}bad_{}_{}_{}.txt", File::GetUserPath(D_DUMP_IDX), shader_stage,
- g_video_backend->GetName(), counter);
+ g_video_backend->GetConfigName(), counter);
}
// Run from the CPU thread (from VideoInterface.cpp)
@@ -169,7 +169,7 @@ static VideoBackendBase* GetDefaultVideoBackend()
std::string VideoBackendBase::GetDefaultBackendConfigName()
{
auto* default_backend = GetDefaultVideoBackend();
- return default_backend ? default_backend->GetName() : "";
+ return default_backend ? default_backend->GetConfigName() : "";
}
std::string VideoBackendBase::GetDefaultBackendDisplayName()
@@ -222,7 +222,7 @@ void VideoBackendBase::ActivateBackend(const std::string& name)
g_video_backend = GetDefaultVideoBackend();
const auto& backends = GetAvailableBackends();
- const auto iter = std::ranges::find(backends, name, &VideoBackendBase::GetName);
+ const auto iter = std::ranges::find(backends, name, &VideoBackendBase::GetConfigName);
if (iter == backends.end())
return;
diff --git a/Source/Core/VideoCommon/VideoBackendBase.h b/Source/Core/VideoCommon/VideoBackendBase.h
index 223e46ad03..82d9adb589 100644
--- a/Source/Core/VideoCommon/VideoBackendBase.h
+++ b/Source/Core/VideoCommon/VideoBackendBase.h
@@ -37,8 +37,8 @@ public:
virtual bool Initialize(const WindowSystemInfo& wsi) = 0;
virtual void Shutdown() = 0;
- virtual std::string GetName() const = 0;
- virtual std::string GetDisplayName() const { return GetName(); }
+ virtual std::string GetConfigName() const = 0;
+ virtual std::string GetDisplayName() const { return GetConfigName(); }
virtual void InitBackendInfo(const WindowSystemInfo& wsi) = 0;
virtual std::optional<std::string> GetWarningMessage() const { return {}; }