VideoBackendBase: Clarify function name
Rename GetDefaultBackendName to GetDefaultBackendConfigName to distinguish it from the display name.
This commit is contained in:
parent
53ede795a2
commit
7b8610f4ea
|
@ -302,7 +302,7 @@ public final class NativeLibrary
|
||||||
|
|
||||||
public static native int DefaultCPUCore();
|
public static native int DefaultCPUCore();
|
||||||
|
|
||||||
public static native String GetDefaultGraphicsBackendName();
|
public static native String GetDefaultGraphicsBackendConfigName();
|
||||||
|
|
||||||
public static native int GetMaxLogLevel();
|
public static native int GetMaxLogLevel();
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ enum class StringSetting(
|
||||||
Settings.FILE_DOLPHIN,
|
Settings.FILE_DOLPHIN,
|
||||||
Settings.SECTION_INI_CORE,
|
Settings.SECTION_INI_CORE,
|
||||||
"GFXBackend",
|
"GFXBackend",
|
||||||
NativeLibrary.GetDefaultGraphicsBackendName()
|
NativeLibrary.GetDefaultGraphicsBackendConfigName()
|
||||||
),
|
),
|
||||||
MAIN_DUMP_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "DumpPath", ""),
|
MAIN_DUMP_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "DumpPath", ""),
|
||||||
MAIN_LOAD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "LoadPath", ""),
|
MAIN_LOAD_PATH(Settings.FILE_DOLPHIN, Settings.SECTION_INI_GENERAL, "LoadPath", ""),
|
||||||
|
|
|
@ -408,9 +408,10 @@ JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_DefaultCPUCo
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jstring JNICALL
|
JNIEXPORT jstring JNICALL
|
||||||
Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDefaultGraphicsBackendName(JNIEnv* env, jclass)
|
Java_org_dolphinemu_dolphinemu_NativeLibrary_GetDefaultGraphicsBackendConfigName(JNIEnv* env,
|
||||||
|
jclass)
|
||||||
{
|
{
|
||||||
return ToJString(env, VideoBackendBase::GetDefaultBackendName());
|
return ToJString(env, VideoBackendBase::GetDefaultBackendConfigName());
|
||||||
}
|
}
|
||||||
|
|
||||||
JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetMaxLogLevel(JNIEnv*, jclass)
|
JNIEXPORT jint JNICALL Java_org_dolphinemu_dolphinemu_NativeLibrary_GetMaxLogLevel(JNIEnv*, jclass)
|
||||||
|
|
|
@ -212,7 +212,7 @@ const Info<bool> MAIN_RAM_OVERRIDE_ENABLE{{System::Main, "Core", "RAMOverrideEna
|
||||||
const Info<u32> MAIN_MEM1_SIZE{{System::Main, "Core", "MEM1Size"}, Memory::MEM1_SIZE_RETAIL};
|
const Info<u32> MAIN_MEM1_SIZE{{System::Main, "Core", "MEM1Size"}, Memory::MEM1_SIZE_RETAIL};
|
||||||
const Info<u32> MAIN_MEM2_SIZE{{System::Main, "Core", "MEM2Size"}, Memory::MEM2_SIZE_RETAIL};
|
const Info<u32> MAIN_MEM2_SIZE{{System::Main, "Core", "MEM2Size"}, Memory::MEM2_SIZE_RETAIL};
|
||||||
const Info<std::string> MAIN_GFX_BACKEND{{System::Main, "Core", "GFXBackend"},
|
const Info<std::string> MAIN_GFX_BACKEND{{System::Main, "Core", "GFXBackend"},
|
||||||
VideoBackendBase::GetDefaultBackendName()};
|
VideoBackendBase::GetDefaultBackendConfigName()};
|
||||||
const Info<HSP::HSPDeviceType> MAIN_HSP_DEVICE{{System::Main, "Core", "HSPDevice"},
|
const Info<HSP::HSPDeviceType> MAIN_HSP_DEVICE{{System::Main, "Core", "HSPDevice"},
|
||||||
HSP::HSPDeviceType::None};
|
HSP::HSPDeviceType::None};
|
||||||
const Info<u32> MAIN_ARAM_EXPANSION_SIZE{{System::Main, "Core", "ARAMExpansionSize"}, 0x400000};
|
const Info<u32> MAIN_ARAM_EXPANSION_SIZE{{System::Main, "Core", "ARAMExpansionSize"}, 0x400000};
|
||||||
|
|
|
@ -222,7 +222,7 @@ static VideoBackendBase* GetDefaultVideoBackend()
|
||||||
return backends.front().get();
|
return backends.front().get();
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string VideoBackendBase::GetDefaultBackendName()
|
std::string VideoBackendBase::GetDefaultBackendConfigName()
|
||||||
{
|
{
|
||||||
auto* default_backend = GetDefaultVideoBackend();
|
auto* default_backend = GetDefaultVideoBackend();
|
||||||
return default_backend ? default_backend->GetName() : "";
|
return default_backend ? default_backend->GetName() : "";
|
||||||
|
|
|
@ -64,7 +64,7 @@ public:
|
||||||
u32 Video_GetQueryResult(PerfQueryType type);
|
u32 Video_GetQueryResult(PerfQueryType type);
|
||||||
u16 Video_GetBoundingBox(int index);
|
u16 Video_GetBoundingBox(int index);
|
||||||
|
|
||||||
static std::string GetDefaultBackendName();
|
static std::string GetDefaultBackendConfigName();
|
||||||
static const std::vector<std::unique_ptr<VideoBackendBase>>& GetAvailableBackends();
|
static const std::vector<std::unique_ptr<VideoBackendBase>>& GetAvailableBackends();
|
||||||
static void ActivateBackend(const std::string& name);
|
static void ActivateBackend(const std::string& name);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue