diff options
| author | Jason Ekstrand <[email protected]> | 2017-02-27 09:36:20 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2017-04-27 20:08:46 -0700 |
| commit | d4d9258b6151781893f662002a2f07fe06410838 (patch) | |
| tree | 78779b1c0341eab2825abf6448c6859d2f297a46 | |
| parent | 02767cb4ffb83a0c2c19ce182e10993a64b41fb3 (diff) | |
anv/physical_device: Rename uuid to pipeline_cache_uuid
We're about to have more UUIDs for different things so this one really
needs to be properly labeled.
Reviewed-by: Chad Versace <[email protected]>
| -rw-r--r-- | src/intel/vulkan/anv_device.c | 5 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_pipeline_cache.c | 4 | ||||
| -rw-r--r-- | src/intel/vulkan/anv_private.h | 2 |
3 files changed, 6 insertions, 5 deletions
diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c index 767f7469d19..4d0d613d61f 100644 --- a/src/intel/vulkan/anv_device.c +++ b/src/intel/vulkan/anv_device.c @@ -121,7 +121,7 @@ anv_physical_device_init_uuids(struct anv_physical_device *device) _mesa_sha1_update(&sha1_ctx, &device->chipset_id, sizeof(device->chipset_id)); _mesa_sha1_final(&sha1_ctx, sha1); - memcpy(device->uuid, sha1, VK_UUID_SIZE); + memcpy(device->pipeline_cache_uuid, sha1, VK_UUID_SIZE); return VK_SUCCESS; } @@ -721,7 +721,8 @@ void anv_GetPhysicalDeviceProperties( }; strcpy(pProperties->deviceName, pdevice->name); - memcpy(pProperties->pipelineCacheUUID, pdevice->uuid, VK_UUID_SIZE); + memcpy(pProperties->pipelineCacheUUID, + pdevice->pipeline_cache_uuid, VK_UUID_SIZE); } void anv_GetPhysicalDeviceProperties2KHR( diff --git a/src/intel/vulkan/anv_pipeline_cache.c b/src/intel/vulkan/anv_pipeline_cache.c index cdd8215b9b5..3cfe3ec187e 100644 --- a/src/intel/vulkan/anv_pipeline_cache.c +++ b/src/intel/vulkan/anv_pipeline_cache.c @@ -351,7 +351,7 @@ anv_pipeline_cache_load(struct anv_pipeline_cache *cache, return; if (header.device_id != device->chipset_id) return; - if (memcmp(header.uuid, pdevice->uuid, VK_UUID_SIZE) != 0) + if (memcmp(header.uuid, pdevice->pipeline_cache_uuid, VK_UUID_SIZE) != 0) return; const void *end = data + size; @@ -498,7 +498,7 @@ VkResult anv_GetPipelineCacheData( header->header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE; header->vendor_id = 0x8086; header->device_id = device->chipset_id; - memcpy(header->uuid, pdevice->uuid, VK_UUID_SIZE); + memcpy(header->uuid, pdevice->pipeline_cache_uuid, VK_UUID_SIZE); p += align_u32(header->header_size, 8); uint32_t *count = p; diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h index 061bd1a5dfd..506bab98c48 100644 --- a/src/intel/vulkan/anv_private.h +++ b/src/intel/vulkan/anv_private.h @@ -630,7 +630,7 @@ struct anv_physical_device { uint32_t eu_total; uint32_t subslice_total; - uint8_t uuid[VK_UUID_SIZE]; + uint8_t pipeline_cache_uuid[VK_UUID_SIZE]; struct wsi_device wsi_device; int local_fd; |