Kaydet (Commit) 3711ccb7 authored tarafından Tomaž Vajngerl's avatar Tomaž Vajngerl

opengl: support Win 10 in black/white listing

Change-Id: I9a3055fc60f738ab941816e40f4dd147deedafbe
üst e253ff96
......@@ -25,6 +25,7 @@ enum OperatingSystem {
DRIVER_OS_WINDOWS_7,
DRIVER_OS_WINDOWS_8,
DRIVER_OS_WINDOWS_8_1,
DRIVER_OS_WINDOWS_10,
DRIVER_OS_LINUX,
DRIVER_OS_OS_X_10_5,
DRIVER_OS_OS_X_10_6,
......
......@@ -206,7 +206,7 @@ enum {
kWindows7 = 0x60001,
kWindows8 = 0x60002,
kWindows8_1 = 0x60003,
kWindows10 = 0x60004
kWindows10 = 0x100000
};
......@@ -226,6 +226,8 @@ wgl::OperatingSystem WindowsVersionToOperatingSystem(int32_t aWindowsVersion)
return wgl::DRIVER_OS_WINDOWS_8;
case kWindows8_1:
return wgl::DRIVER_OS_WINDOWS_8_1;
case kWindows10:
return wgl::DRIVER_OS_WINDOWS_10;
case kWindowsUnknown:
default:
return wgl::DRIVER_OS_UNKNOWN;
......
......@@ -55,6 +55,10 @@ wgl::OperatingSystem getOperatingSystem(const OString& rString)
{
return wgl::DRIVER_OS_WINDOWS_8_1;
}
else if (rString == "10")
{
return wgl::DRIVER_OS_WINDOWS_10;
}
return wgl::DRIVER_OS_UNKNOWN;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment