[Libreoffice-commits] core.git: vcl/skia

Luboš Luňák (via logerrit) logerrit at kemper.freedesktop.org
Mon Feb 10 13:17:01 UTC 2020


 vcl/skia/SkiaHelper.cxx |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit da4bfe472945b05fd7baa9f75e7c89d8657a542a
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Mon Feb 10 14:11:09 2020 +0100
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Mon Feb 10 14:16:20 2020 +0100

    log human-readable vulkan driver version too
    
    Change-Id: If21f6720b77a55e23864140bb10e7ff7a24e3de2

diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx
index 39588aedcf53..d824eddb7a4c 100644
--- a/vcl/skia/SkiaHelper.cxx
+++ b/vcl/skia/SkiaHelper.cxx
@@ -43,9 +43,10 @@ static bool isVulkanBlacklisted(const VkPhysicalDeviceProperties& props)
     SAL_INFO("vcl.skia",
              "Vulkan API version: "
                  << (props.apiVersion >> 22) << "." << ((props.apiVersion >> 12) & 0x3ff) << "."
-                 << (props.apiVersion & 0xfff) << ", driver version: " << std::hex
-                 << props.driverVersion << ", vendor:" << props.vendorID
-                 << ", device: " << props.deviceID << std::dec
+                 << (props.apiVersion & 0xfff) << ", driver version: "
+                 << (props.driverVersion >> 22) << "." << ((props.driverVersion >> 12) & 0x3ff)
+                 << "." << (props.driverVersion & 0xfff) << std::hex << ", vendor: 0x"
+                 << props.vendorID << ", device: 0x" << props.deviceID << std::dec
                  << ", type: " << types[std::min<unsigned>(props.deviceType, SAL_N_ELEMENTS(types))]
                  << ", name: " << props.deviceName);
     return false;


More information about the Libreoffice-commits mailing list