remove 'ATI' from the driver list

The ATI brand has not been in use for a decade, and it's confusing
to have both AMD and ATI there. All AMD gfx cards use the 0x1002
formerly-ATI PCI vendor ID, so just use AMD and that vendor ID.

Change-Id: I9d60f1e86fe12a2e0fe9548c7c912d2d1ecec240
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88534
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lunak@collabora.com>
This commit is contained in:
Luboš Luňák
2020-02-13 15:44:53 +01:00
parent 2b702f7436
commit 7fcac1989c
5 changed files with 4 additions and 14 deletions
-1
View File
@@ -65,7 +65,6 @@ enum DeviceVendor
VendorIntel,
VendorNVIDIA,
VendorAMD,
VendorATI,
VendorMicrosoft,
};
const int DeviceVendorMax = VendorMicrosoft + 1;
+1 -4
View File
@@ -10,7 +10,7 @@
<!--
entry attributes:
os - "all", "7", "8", "8_1", "10"
vendor - "all", "intel", "ati", "amd", "nvidia", "microsoft"
vendor - "all", "intel", "amd", "nvidia", "microsoft"
compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start"
version
minVersion
@@ -47,9 +47,6 @@
<entry os="10" vendor="intel" compare="between_inclusive_start" minVersion="26.20.100.6861" maxVersion="26.20.100.7584"><!-- tdf#125516 -->
<device id="all"/>
</entry>
<entry os="all" vendor="ati" compare="less" version="15.200.1062.1004"> <!-- 150.200 -->
<device id="all"/>
</entry>
<entry os="all" vendor="amd" compare="less" version="15.200.1062.1004"> <!-- 150.200 -->
<device id="all"/>
</entry>
+1 -1
View File
@@ -10,7 +10,7 @@
<!--
entry attributes:
os - "all", "7", "8", "8_1", "10"
vendor - "all", "intel", "ati", "amd", "nvidia", "microsoft"
vendor - "all", "intel", "amd", "nvidia", "microsoft"
compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start"
version
minVersion
+2 -2
View File
@@ -10,7 +10,7 @@
<!--
entry attributes:
os - "all", "7", "8", "8_1", "10", "linux"
vendor - "all", "intel", "ati", "amd", "nvidia", "microsoft"
vendor - "all", "intel", "amd", "nvidia", "microsoft"
compare - "less", "less_equal", "greater", "greater_equal", "equal", "not_equal", "between_exclusive", "between_inclusive", "between_inclusive_start"
version
minVersion
@@ -22,7 +22,7 @@
</whitelist>
<blacklist>
<!-- example:
<entry os="all" vendor="ati" compare="equal" version="2.0.106">
<entry os="all" vendor="amd" compare="equal" version="2.0.106">
<device id="all"/>
</entry>
-->
-6
View File
@@ -106,10 +106,6 @@ static OUString GetVendorId(const OString& rString)
return "0x10de";
}
else if (rString == "amd")
{
return "0x1022";
}
else if (rString == "ati")
{
return "0x1002";
}
@@ -137,8 +133,6 @@ OUString GetVendorId(DeviceVendor id)
case VendorNVIDIA:
return "0x10de";
case VendorAMD:
return "0x1022";
case VendorATI:
return "0x1002";
case VendorMicrosoft:
return "0x1414";