fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa/st: Skip querying PCI values in interop_query_device_info if version >= 4

Browse source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26071>
This commit is contained in:
Antonio Gomes 2023-11-10 23:38:25 -03:00 • committed by Marge Bot
parent 89622f5089
commit a7272a6f24
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/GL/mesa_glinterop.h
View file

@ -101,7 +101,7 @@ enum {
MESA_GLINTEROP_ACCESS_WRITE_ONLY MESA_GLINTEROP_ACCESS_WRITE_ONLY
}; };
#define MESA_GLINTEROP_DEVICE_INFO_VERSION 3 #define MESA_GLINTEROP_DEVICE_INFO_VERSION 4
#define UUID_SIZE 16 #define UUID_SIZE 16

15
src/mesa/state_tracker/st_interop.c
View file

@ -43,10 +43,13 @@ st_interop_query_device_info(struct st_context *st,
if (out->version == 0) if (out->version == 0)
return MESA_GLINTEROP_INVALID_VERSION; return MESA_GLINTEROP_INVALID_VERSION;
out->pci_segment_group = screen->get_param(screen, PIPE_CAP_PCI_GROUP); /* PCI values are obsolete on version >= 4 of the interface */
out->pci_bus = screen->get_param(screen, PIPE_CAP_PCI_BUS); if (out->version < 4) {
out->pci_device = screen->get_param(screen, PIPE_CAP_PCI_DEVICE); out->pci_segment_group = screen->get_param(screen, PIPE_CAP_PCI_GROUP);
out->pci_function = screen->get_param(screen, PIPE_CAP_PCI_FUNCTION); out->pci_bus = screen->get_param(screen, PIPE_CAP_PCI_BUS);
out->pci_device = screen->get_param(screen, PIPE_CAP_PCI_DEVICE);
out->pci_function = screen->get_param(screen, PIPE_CAP_PCI_FUNCTION);
}
out->vendor_id = screen->get_param(screen, PIPE_CAP_VENDOR_ID); out->vendor_id = screen->get_param(screen, PIPE_CAP_VENDOR_ID);
out->device_id = screen->get_param(screen, PIPE_CAP_DEVICE_ID); out->device_id = screen->get_param(screen, PIPE_CAP_DEVICE_ID);
@ -59,8 +62,8 @@ st_interop_query_device_info(struct st_context *st,
if (out->version >= 3 && screen->get_device_uuid) if (out->version >= 3 && screen->get_device_uuid)
screen->get_device_uuid(screen, out->device_uuid); screen->get_device_uuid(screen, out->device_uuid);
/* Instruct the caller that we support up-to version three of the interface */ /* Instruct the caller that we support up-to version four of the interface */
out->version = MIN2(out->version, 3); out->version = MIN2(out->version, 4);
return MESA_GLINTEROP_SUCCESS; return MESA_GLINTEROP_SUCCESS;
} }