novidia, gpumodel: actually detect AMD instead of non-nvidia

This commit is contained in:
somewhatlurker
2020-11-20 14:52:29 +11:00
parent f2510ed6b1
commit 8c4852ea15
3 changed files with 24 additions and 11 deletions
@@ -382,13 +382,13 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
{
loadConfig();
if (!disable_nvidia_check)
if (!disable_amd_check)
{
std::string gpuName = GPUModel::getGpuName();
if (gpuName != "Other" && gpuName != "Unknown")
if (gpuName != "AMD")
{
// detected Nvidia GPU
printf("[Novidia] Detected Nvidia GPU! Quitting!\n");
printf("[Novidia] Detected Non-AMD GPU! Quitting!\n");
return TRUE;
}
}
@@ -444,7 +444,7 @@ BOOL APIENTRY DllMain(HMODULE hModule, DWORD ul_reason_for_call, LPVOID lpReserv
using namespace PluginConfig;
PluginConfigOption config[] = {
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"disable_nvidia_check", L"general", CONFIG_FILE, L"Disable Nvidia Check", L"On systems with both AMD and Nvidia graphics, the plugin may disable functionality due to detecting the Nvidia GPU. Set this to forcefully enable functionality.", false, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"disable_amd_check", L"general", CONFIG_FILE, L"Disable AMD Check", L"On systems with both AMD and Nvidia graphics, the plugin may disable functionality due to detecting a non-AMD GPU.\nSet this to forcefully enable functionality.", false, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"enable_chara_skinning", L"general", CONFIG_FILE, L"Enable Chara Skinning", L"If you really need to get extra performance, you can disable uploading skinning data. (character models will disappear)", true, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"use_TexSubImage", L"general", CONFIG_FILE, L"Use glTexSubImage", L"glTexSubImage should offer higher performance, but stuttering has been reported when it is used.\nTry disabling this if you have issues.", true, false } },
{ CONFIG_BOOLEAN, new PluginConfigBooleanData{ L"force_BGRA_upload", L"general", CONFIG_FILE, L"Force BGRA Texture Uploads", L"BGRA format uploads seem to run faster (on some hardware), but drivers may suggest RGBA instead.\nUsing this forces uploads to use the BGRA format.\n\nDisabling this may decrease or improve performance.", true, false } },
@@ -24,7 +24,7 @@ bool checkBufferTargetOk(GLenum target)
int __stdcall stub() { return 1; }
bool disable_nvidia_check;
bool disable_amd_check;
bool enable_chara_skinning;
bool use_TexSubImage;
bool force_BGRA_upload;
@@ -90,7 +90,7 @@ LPCWSTR CONFIG_FILE = CONFIG_FILE_STRING.c_str();
void loadConfig()
{
disable_nvidia_check = GetPrivateProfileIntW(L"general", L"disable_nvidia_check", 0, CONFIG_FILE) > 0 ? true : false;
disable_amd_check = GetPrivateProfileIntW(L"general", L"disable_amd_check", 0, CONFIG_FILE) > 0 ? true : false;
enable_chara_skinning = GetPrivateProfileIntW(L"general", L"enable_chara_skinning", 1, CONFIG_FILE) > 0 ? true : false;
use_TexSubImage = GetPrivateProfileIntW(L"general", L"use_TexSubImage", 1, CONFIG_FILE) > 0 ? true : false;
force_BGRA_upload = GetPrivateProfileIntW(L"general", L"force_BGRA_upload", 1, CONFIG_FILE) > 0 ? true : false;