mirror of
https://github.com/vcmi/vcmi.git
synced 2025-08-13 19:54:17 +02:00
Change default SDL driver name from opengl to empty (autoselection)
This commit is contained in:
@@ -199,6 +199,7 @@
|
|||||||
},
|
},
|
||||||
"driver" : {
|
"driver" : {
|
||||||
"type" : "string",
|
"type" : "string",
|
||||||
|
"defaultWindows" : "",
|
||||||
"default" : "opengl",
|
"default" : "opengl",
|
||||||
"description" : "preferred graphics backend driver name for SDL2"
|
"description" : "preferred graphics backend driver name for SDL2"
|
||||||
},
|
},
|
||||||
|
@@ -169,6 +169,8 @@ static QStringList getAvailableRenderingDrivers()
|
|||||||
SDL_Init(SDL_INIT_VIDEO);
|
SDL_Init(SDL_INIT_VIDEO);
|
||||||
QStringList result;
|
QStringList result;
|
||||||
|
|
||||||
|
result += QString(); // empty value for autoselection
|
||||||
|
|
||||||
int driversCount = SDL_GetNumRenderDrivers();
|
int driversCount = SDL_GetNumRenderDrivers();
|
||||||
|
|
||||||
for(int it = 0; it < driversCount; it++)
|
for(int it = 0; it < driversCount; it++)
|
||||||
|
@@ -1289,7 +1289,12 @@ static JsonNode getDefaultValue(const JsonNode & schema, std::string fieldName)
|
|||||||
#elif defined(VCMI_ANDROID)
|
#elif defined(VCMI_ANDROID)
|
||||||
if (!fieldProps["defaultAndroid"].isNull())
|
if (!fieldProps["defaultAndroid"].isNull())
|
||||||
return fieldProps["defaultAndroid"];
|
return fieldProps["defaultAndroid"];
|
||||||
#elif !defined(VCMI_MOBILE)
|
#elif defined(VCMI_WINDOWS)
|
||||||
|
if (!fieldProps["defaultWindows"].isNull())
|
||||||
|
return fieldProps["defaultWindows"];
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(VCMI_MOBILE)
|
||||||
if (!fieldProps["defaultDesktop"].isNull())
|
if (!fieldProps["defaultDesktop"].isNull())
|
||||||
return fieldProps["defaultDesktop"];
|
return fieldProps["defaultDesktop"];
|
||||||
#endif
|
#endif
|
||||||
|
Reference in New Issue
Block a user