File 0001-llvmpipe-Add-get_-driver-device-_uuid-impl... of Package Mesa

Overview Repositories Revisions Requests Users Attributes Meta

File 0001-llvmpipe-Add-get_-driver-device-_uuid-implementation.patch of Package Mesa (Revision fed8ff2f39984bc2cd1b544d82a26e11)

Currently displaying revision fed8ff2f39984bc2cd1b544d82a26e11 , Show latest

From eaefb1e07aac88f4ed46d478b3d1cff050012e28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bruens@rwth-aachen.de>
Date: Fri, 14 Jan 2022 13:49:49 +0100
Subject: [PATCH] llvmpipe: Add get_{driver,device}_uuid implementations
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Commit 9da15aa3aa94 ("llvmpipe: enable EXT_memory_object(_fd)") enabled
the extension, but left this unimplemented.

Leaving this unimplemented causes segfaults for anyone trying to retrieve
the UUIDs, as the calling code in the state tracker does not check if the
function is implemented. This affects e.g. current Wine versions.

Set the UUID to all zeros. Although this slightly violates the vulkan
specification (since 1.2.146), the UUIDs have to match the ones from
lavapipe (lvp_get_physical_device_properties_1_1).

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/TBD
Signed-off-by: Stefan Brüns <stefan.bruens@rwth-aachen.de>
---
 src/gallium/drivers/llvmpipe/lp_screen.c | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
index 175b14d6f39..b5977c8eae4 100644
--- a/src/gallium/drivers/llvmpipe/lp_screen.c
+++ b/src/gallium/drivers/llvmpipe/lp_screen.c
@@ -568,6 +568,18 @@ llvmpipe_get_compute_param(struct pipe_screen *_screen,
    return 0;
 }
 
+static void
+llvmpipe_get_driver_uuid(struct pipe_screen *pscreen, char *uuid)
+{
+   memset(uuid, 0, PIPE_UUID_SIZE);
+}
+
+static void
+llvmpipe_get_device_uuid(struct pipe_screen *pscreen, char *uuid)
+{
+   memset(uuid, 0, PIPE_UUID_SIZE);
+}
+
 static const struct nir_shader_compiler_options gallivm_nir_options = {
    .lower_scmp = true,
    .lower_flrp32 = true,
@@ -1049,6 +1061,9 @@ llvmpipe_create_screen(struct sw_winsys *winsys)
 
    screen->base.get_timestamp = llvmpipe_get_timestamp;
 
+   screen->base.get_driver_uuid = llvmpipe_get_driver_uuid;
+   screen->base.get_device_uuid = llvmpipe_get_device_uuid;
+
    screen->base.finalize_nir = llvmpipe_finalize_nir;
 
    screen->base.get_disk_shader_cache = lp_get_disk_shader_cache;
-- 
2.34.1

Places

File 0001-llvmpipe-Add-get_-driver-device-_uuid-implementation.patch of Package Mesa (Revision fed8ff2f39984bc2cd1b544d82a26e11)

Places