OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Andres Rodriguez
2017-07-12 18:45:29 -04:00
committed by Timothy Arceri
parent a0e6b9a2db
commit a973b9a9f8
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/amd/vulkan/radv_device.c
View File

@@ -311,7 +311,7 @@ radv_physical_device_init(struct radv_physical_device *device,
goto fail; 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); radv_finish_wsi(device);
device->ws->destroy(device->ws); device->ws->destroy(device->ws);
result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED, result = vk_errorf(VK_ERROR_INITIALIZATION_FAILED,
@@ -775,7 +775,7 @@ void radv_GetPhysicalDeviceProperties(
}; };
strcpy(pProperties->deviceName, pdevice->name); 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( void radv_GetPhysicalDeviceProperties2KHR(

4
src/amd/vulkan/radv_pipeline_cache.c
View File

@@ -332,7 +332,7 @@ radv_pipeline_cache_load(struct radv_pipeline_cache *cache,
return; return;
if (header.device_id != device->physical_device->rad_info.pci_id) if (header.device_id != device->physical_device->rad_info.pci_id)
return; 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; return;
char *end = (void *) data + size; char *end = (void *) data + size;
@@ -431,7 +431,7 @@ VkResult radv_GetPipelineCacheData(
header->header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE; header->header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE;
header->vendor_id = 0x1002; header->vendor_id = 0x1002;
header->device_id = device->physical_device->rad_info.pci_id; 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; p += header->header_size;
struct cache_entry *entry; struct cache_entry *entry;

2
src/amd/vulkan/radv_private.h
View File

@@ -267,8 +267,8 @@ struct radv_physical_device {
struct radeon_info rad_info; struct radeon_info rad_info;
char path[20]; char path[20];
const char * name; const char * name;
uint8_t uuid[VK_UUID_SIZE];
uint8_t device_uuid[VK_UUID_SIZE]; uint8_t device_uuid[VK_UUID_SIZE];
uint8_t cache_uuid[VK_UUID_SIZE];
int local_fd; int local_fd;
struct wsi_device wsi_device; struct wsi_device wsi_device;