[Libreoffice-commits] core.git: vcl/inc vcl/opengl vcl/qa vcl/skia vcl/source

[Luboš Luňák (via logerrit)]

 vcl/inc/driverblocklist.hxx                |    1 -
 vcl/opengl/opengl_blacklist_windows.xml    |    5 +----
 vcl/qa/cppunit/test_blocklist_evaluate.xml |    2 +-
 vcl/skia/skia_blacklist_vulkan.xml         |    4 ++--
 vcl/source/helper/driverblocklist.cxx      |    6 ------
 5 files changed, 4 insertions(+), 14 deletions(-)

New commits:
commit 7fcac1989c8dd853779bbd04c4eaddc50a5bbc5e
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Wed Feb 12 11:31:18 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Thu Feb 13 15:44:53 2020 +0100

    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 at collabora.com>

diff --git a/vcl/inc/driverblocklist.hxx b/vcl/inc/driverblocklist.hxx
index e8f99378fa24..6a0180386a9a 100644
--- a/vcl/inc/driverblocklist.hxx
+++ b/vcl/inc/driverblocklist.hxx
@@ -65,7 +65,6 @@ enum DeviceVendor
     VendorIntel,
     VendorNVIDIA,
     VendorAMD,
-    VendorATI,
     VendorMicrosoft,
 };
 const int DeviceVendorMax = VendorMicrosoft + 1;
diff --git a/vcl/opengl/opengl_blacklist_windows.xml b/vcl/opengl/opengl_blacklist_windows.xml
index 2b4bdb828184..2a859631eb81 100644
--- a/vcl/opengl/opengl_blacklist_windows.xml
+++ b/vcl/opengl/opengl_blacklist_windows.xml
@@ -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>
diff --git a/vcl/qa/cppunit/test_blocklist_evaluate.xml b/vcl/qa/cppunit/test_blocklist_evaluate.xml
index dbcee17a1b18..00a8b0439146 100644
--- a/vcl/qa/cppunit/test_blocklist_evaluate.xml
+++ b/vcl/qa/cppunit/test_blocklist_evaluate.xml
@@ -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
diff --git a/vcl/skia/skia_blacklist_vulkan.xml b/vcl/skia/skia_blacklist_vulkan.xml
index 2c7714a38f8a..b7dd35420bc3 100644
--- a/vcl/skia/skia_blacklist_vulkan.xml
+++ b/vcl/skia/skia_blacklist_vulkan.xml
@@ -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>
 -->
diff --git a/vcl/source/helper/driverblocklist.cxx b/vcl/source/helper/driverblocklist.cxx
index a63fdc00cd30..0700731abf45 100644
--- a/vcl/source/helper/driverblocklist.cxx
+++ b/vcl/source/helper/driverblocklist.cxx
@@ -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";