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

anv: Use vk_object_alloc/free

Browse Source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10123>
This commit is contained in:
Jason Ekstrand
2021-04-08 16:12:27 -05:00
committed by Marge Bot
parent 22478bb0e4
commit c43109c07b
10 changed files with 70 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/intel/vulkan/anv_perf.c
View File

@@ -218,8 +218,8 @@ VkResult anv_AcquirePerformanceConfigurationINTEL(
ANV_FROM_HANDLE(anv_device, device, _device);
struct anv_performance_configuration_intel *config;
config = vk_alloc(&device->vk.alloc, sizeof(*config), 8,
VK_SYSTEM_ALLOCATION_SCOPE_DEVICE);
config = vk_object_alloc(&device->vk, NULL, sizeof(*config),
VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL);
if (!config)
return vk_error(VK_ERROR_OUT_OF_HOST_MEMORY);
@@ -228,7 +228,7 @@ VkResult anv_AcquirePerformanceConfigurationINTEL(
gen_perf_load_configuration(device->physical->perf, device->fd,
GEN_PERF_QUERY_GUID_MDAPI);
if (!config->register_config) {
vk_free(&device->vk.alloc, config);
vk_object_free(&device->vk, NULL, config);
return VK_INCOMPLETE;
}
@@ -237,16 +237,13 @@ VkResult anv_AcquirePerformanceConfigurationINTEL(
config->register_config, NULL /* guid */);
if (ret < 0) {
ralloc_free(config->register_config);
vk_free(&device->vk.alloc, config);
vk_object_free(&device->vk, NULL, config);
return VK_INCOMPLETE;
}
config->config_id = ret;
}
vk_object_base_init(&device->vk, &config->base,
VK_OBJECT_TYPE_PERFORMANCE_CONFIGURATION_INTEL);
*pConfiguration = anv_performance_configuration_intel_to_handle(config);
return VK_SUCCESS;
@@ -263,8 +260,8 @@ VkResult anv_ReleasePerformanceConfigurationINTEL(
intel_ioctl(device->fd, DRM_IOCTL_I915_PERF_REMOVE_CONFIG, &config->config_id);
ralloc_free(config->register_config);
vk_object_base_finish(&config->base);
vk_free(&device->vk.alloc, config);
vk_object_free(&device->vk, NULL, config);
return VK_SUCCESS;
}