AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/rmv: remove unnecessary is_internal parameter to some helpers

Browse Source 
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28367>
This commit is contained in:
Samuel Pitoiset
2024-03-25 10:29:10 +01:00
parent f9105dea24
commit 0b1ab23130
4 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/amd/vulkan/radv_descriptor_set.c
+3 -4
View File
@@ -794,8 +794,7 @@ radv_destroy_descriptor_pool(struct radv_device *device, const VkAllocationCallb
static VkResult
radv_create_descriptor_pool(struct radv_device *device, const VkDescriptorPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, VkDescriptorPool *pDescriptorPool,
bool is_internal)
const VkAllocationCallbacks *pAllocator, VkDescriptorPool *pDescriptorPool)
{
struct radv_descriptor_pool *pool;
uint64_t size = sizeof(struct radv_descriptor_pool);
@@ -940,7 +939,7 @@ radv_create_descriptor_pool(struct radv_device *device, const VkDescriptorPoolCr
pool->max_entry_count = pCreateInfo->maxSets;
*pDescriptorPool = radv_descriptor_pool_to_handle(pool);
radv_rmv_log_descriptor_pool_create(device, pCreateInfo, *pDescriptorPool, is_internal);
radv_rmv_log_descriptor_pool_create(device, pCreateInfo, *pDescriptorPool);
return VK_SUCCESS;
}
@@ -949,7 +948,7 @@ radv_CreateDescriptorPool(VkDevice _device, const VkDescriptorPoolCreateInfo *pC
const VkAllocationCallbacks *pAllocator, VkDescriptorPool *pDescriptorPool)
{
RADV_FROM_HANDLE(radv_device, device, _device);
return radv_create_descriptor_pool(device, pCreateInfo, pAllocator, pDescriptorPool, false);
return radv_create_descriptor_pool(device, pCreateInfo, pAllocator, pDescriptorPool);
}
VKAPI_ATTR void VKAPI_CALL
src/amd/vulkan/radv_private.h
+2 -2
View File
@@ -3209,7 +3209,7 @@ void radv_rmv_log_buffer_bind(struct radv_device *device, VkBuffer _buffer);
void radv_rmv_log_image_create(struct radv_device *device, const VkImageCreateInfo *create_info, bool is_internal,
VkImage _image);
void radv_rmv_log_image_bind(struct radv_device *device, VkImage _image);
void radv_rmv_log_query_pool_create(struct radv_device *device, VkQueryPool pool, bool is_internal);
void radv_rmv_log_query_pool_create(struct radv_device *device, VkQueryPool pool);
void radv_rmv_log_command_buffer_bo_create(struct radv_device *device, struct radeon_winsys_bo *bo,
uint32_t executable_size, uint32_t data_size, uint32_t scratch_size);
void radv_rmv_log_command_buffer_bo_destroy(struct radv_device *device, struct radeon_winsys_bo *bo);
@@ -3218,7 +3218,7 @@ void radv_rmv_log_border_color_palette_destroy(struct radv_device *device, struc
void radv_rmv_log_sparse_add_residency(struct radv_device *device, struct radeon_winsys_bo *src_bo, uint64_t offset);
void radv_rmv_log_sparse_remove_residency(struct radv_device *device, struct radeon_winsys_bo *src_bo, uint64_t offset);
void radv_rmv_log_descriptor_pool_create(struct radv_device *device, const VkDescriptorPoolCreateInfo *create_info,
VkDescriptorPool pool, bool is_internal);
VkDescriptorPool pool);
void radv_rmv_log_graphics_pipeline_create(struct radv_device *device, struct radv_pipeline *pipeline,
bool is_internal);
void radv_rmv_log_compute_pipeline_create(struct radv_device *device, struct radv_pipeline *pipeline, bool is_internal);
src/amd/vulkan/radv_query.c
+3 -3
View File
@@ -1211,7 +1211,7 @@ radv_destroy_query_pool(struct radv_device *device, const VkAllocationCallbacks
static VkResult
radv_create_query_pool(struct radv_device *device, const VkQueryPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool, bool is_internal)
const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool)
{
VkResult result;
size_t pool_struct_size = pCreateInfo->queryType == VK_QUERY_TYPE_PERFORMANCE_QUERY_KHR
@@ -1316,7 +1316,7 @@ radv_create_query_pool(struct radv_device *device, const VkQueryPoolCreateInfo *
}
*pQueryPool = radv_query_pool_to_handle(pool);
radv_rmv_log_query_pool_create(device, *pQueryPool, is_internal);
radv_rmv_log_query_pool_create(device, *pQueryPool);
return VK_SUCCESS;
}
@@ -1325,7 +1325,7 @@ radv_CreateQueryPool(VkDevice _device, const VkQueryPoolCreateInfo *pCreateInfo,
const VkAllocationCallbacks *pAllocator, VkQueryPool *pQueryPool)
{
RADV_FROM_HANDLE(radv_device, device, _device);
return radv_create_query_pool(device, pCreateInfo, pAllocator, pQueryPool, false);
return radv_create_query_pool(device, pCreateInfo, pAllocator, pQueryPool);
}
VKAPI_ATTR void VKAPI_CALL
src/amd/vulkan/radv_rmv.c
+4 -5
View File
@@ -604,7 +604,7 @@ radv_rmv_log_image_bind(struct radv_device *device, VkImage _image)
}
void
radv_rmv_log_query_pool_create(struct radv_device *device, VkQueryPool _pool, bool is_internal)
radv_rmv_log_query_pool_create(struct radv_device *device, VkQueryPool _pool)
{
if (!device->vk.memory_trace_data.is_enabled)
return;
@@ -615,11 +615,10 @@ radv_rmv_log_query_pool_create(struct radv_device *device, VkQueryPool _pool, bo
pool->vk.query_type != VK_QUERY_TYPE_TRANSFORM_FEEDBACK_STREAM_EXT)
return;
radv_rmv_log_bo_allocate(device, pool->bo, is_internal);
radv_rmv_log_bo_allocate(device, pool->bo, false);
simple_mtx_lock(&device->vk.memory_trace_data.token_mtx);
struct vk_rmv_resource_create_token create_token = {0};
create_token.is_driver_internal = is_internal;
create_token.resource_id = vk_rmv_get_resource_id_locked(&device->vk, (uint64_t)_pool);
create_token.type = VK_RMV_RESOURCE_TYPE_QUERY_HEAP;
create_token.query_pool.type = pool->vk.query_type;
@@ -758,7 +757,7 @@ radv_rmv_log_sparse_remove_residency(struct radv_device *device, struct radeon_w
void
radv_rmv_log_descriptor_pool_create(struct radv_device *device, const VkDescriptorPoolCreateInfo *create_info,
VkDescriptorPool _pool, bool is_internal)
VkDescriptorPool _pool)
{
if (!device->vk.memory_trace_data.is_enabled)
return;
@@ -766,7 +765,7 @@ radv_rmv_log_descriptor_pool_create(struct radv_device *device, const VkDescript
RADV_FROM_HANDLE(radv_descriptor_pool, pool, _pool);
if (pool->bo) {
radv_rmv_log_bo_allocate(device, pool->bo, is_internal);
radv_rmv_log_bo_allocate(device, pool->bo, false);
vk_rmv_log_cpu_map(&device->vk, pool->bo->va, false);
}