radv: rename physical_device->uuid[] to cache_uuid[]

We have a few UUIDs, so lets be more specific.

Signed-off-by: Andres Rodriguez <andresx7@gmail.com>
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/amd/vulkan/radv_device.c b/src/amd/vulkan/radv_device.c
index 5244c157c3547c1c8c5f8821a9c3c37e39a5661d..752d70be4bb374b7a0aef3e51a92f1adcc5116df 100644 (file)
--- a/src/amd/vulkan/radv_device.c
+++ b/src/amd/vulkan/radv_device.c
@@ -311,7 +311,7 @@ radv_physical_device_init(struct radv_physical_device *device,
                goto fail;
        }
 
-       if (radv_device_get_cache_uuid(device->rad_info.family, device->uuid)) {
+       if (radv_device_get_cache_uuid(device->rad_info.family, device->cache_uuid)) {
                radv_finish_wsi(device);
                device->ws->destroy(device->ws);
                result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED,
@@ -775,7 +775,7 @@ void radv_GetPhysicalDeviceProperties(
        };
 
        strcpy(pProperties->deviceName, pdevice->name);
-       memcpy(pProperties->pipelineCacheUUID, pdevice->uuid, VK_UUID_SIZE);
+       memcpy(pProperties->pipelineCacheUUID, pdevice->cache_uuid, VK_UUID_SIZE);
 }
 
 void radv_GetPhysicalDeviceProperties2KHR(

diff --git a/src/amd/vulkan/radv_pipeline_cache.c b/src/amd/vulkan/radv_pipeline_cache.c
index e57c99b8e948605c00360811afcb0388fd0ba284..86479f66236bd27965d79dbc0ab8fcc5b7a912d6 100644 (file)
--- a/src/amd/vulkan/radv_pipeline_cache.c
+++ b/src/amd/vulkan/radv_pipeline_cache.c
@@ -332,7 +332,7 @@ radv_pipeline_cache_load(struct radv_pipeline_cache *cache,
                return;
        if (header.device_id != device->physical_device->rad_info.pci_id)
                return;
-       if (memcmp(header.uuid, device->physical_device->uuid, VK_UUID_SIZE) != 0)
+       if (memcmp(header.uuid, device->physical_device->cache_uuid, VK_UUID_SIZE) != 0)
                return;
 
        char *end = (void *) data + size;
@@ -431,7 +431,7 @@ VkResult radv_GetPipelineCacheData(
        header->header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE;
        header->vendor_id = 0x1002;
        header->device_id = device->physical_device->rad_info.pci_id;
-       memcpy(header->uuid, device->physical_device->uuid, VK_UUID_SIZE);
+       memcpy(header->uuid, device->physical_device->cache_uuid, VK_UUID_SIZE);
        p += header->header_size;
 
        struct cache_entry *entry;

diff --git a/src/amd/vulkan/radv_private.h b/src/amd/vulkan/radv_private.h
index 8cd5ec00463e58b53d2ffb838334cc756f6d617a..21a8d410f00b6dc16102e6d7ee2f518bd49cc063 100644 (file)
--- a/src/amd/vulkan/radv_private.h
+++ b/src/amd/vulkan/radv_private.h
@@ -267,8 +267,8 @@ struct radv_physical_device {
        struct radeon_info rad_info;
        char                                        path[20];
        const char *                                name;
-       uint8_t                                     uuid[VK_UUID_SIZE];
        uint8_t                                     device_uuid[VK_UUID_SIZE];
+       uint8_t                                     cache_uuid[VK_UUID_SIZE];
 
        int local_fd;
        struct wsi_device                       wsi_device;