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

anv: Drop separate chipset_id fields

Browse Source 
This already exists in gen_device_info.  There's no reason to keep
duplicate copies.

Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/merge_requests/3461>
This commit is contained in:
Jason Ekstrand
2020-01-17 23:45:31 -06:00
committed by Marge Bot
parent 02044be23f
commit 3ecfba388a
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/intel/vulkan/anv_pipeline_cache.c
View File

@@ -485,7 +485,7 @@ anv_pipeline_cache_load(struct anv_pipeline_cache *cache,
return;
if (header.vendor_id != 0x8086)
return;
if (header.device_id != device->chipset_id)
if (header.device_id != device->info.chipset_id)
return;
if (memcmp(header.uuid, pdevice->pipeline_cache_uuid, VK_UUID_SIZE) != 0)
return;
@@ -566,7 +566,7 @@ VkResult anv_GetPipelineCacheData(
.header_size = sizeof(struct cache_header),
.header_version = VK_PIPELINE_CACHE_HEADER_VERSION_ONE,
.vendor_id = 0x8086,
.device_id = device->chipset_id,
.device_id = device->info.chipset_id,
};
memcpy(header.uuid, device->physical->pipeline_cache_uuid, VK_UUID_SIZE);
blob_write_bytes(&blob, &header, sizeof(header));