From b8d9afe75ce903d1fbf292b282bf61b68f185aaf Mon Sep 17 00:00:00 2001 From: Rajnesh Kanwal Date: Wed, 28 Sep 2022 19:05:16 +0100 Subject: [PATCH] pvr: Remove double error reporting. Signed-off-by: Rajnesh Kanwal Reviewed-by: Karmjit Mahil Part-of: --- src/imagination/vulkan/pvr_device.c | 2 +- src/imagination/vulkan/pvr_pipeline.c | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/src/imagination/vulkan/pvr_device.c b/src/imagination/vulkan/pvr_device.c index 856d628..7d2359d 100644 --- a/src/imagination/vulkan/pvr_device.c +++ b/src/imagination/vulkan/pvr_device.c @@ -189,7 +189,7 @@ VkResult pvr_CreateInstance(const VkInstanceCreateInfo *pCreateInfo, pAllocator); if (result != VK_SUCCESS) { vk_free(pAllocator, instance); - return vk_error(NULL, result); + return result; } pvr_process_debug_variable(); diff --git a/src/imagination/vulkan/pvr_pipeline.c b/src/imagination/vulkan/pvr_pipeline.c index bfed49d..5654e24 100644 --- a/src/imagination/vulkan/pvr_pipeline.c +++ b/src/imagination/vulkan/pvr_pipeline.c @@ -418,8 +418,7 @@ static VkResult pvr_pds_vertex_attrib_program_create_and_upload( if (result != VK_SUCCESS) { vk_free2(&device->vk.alloc, allocator, entries_buffer); vk_free2(&device->vk.alloc, allocator, staging_buffer); - - return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); + return result; } vk_free2(&device->vk.alloc, allocator, staging_buffer); @@ -519,7 +518,7 @@ static VkResult pvr_pds_vertex_attrib_programs_create_and_upload( return VK_SUCCESS; } -static size_t pvr_pds_get_max_descriptor_upload_const_map_size_in_bytes() +static size_t pvr_pds_get_max_descriptor_upload_const_map_size_in_bytes(void) { /* Maximum memory allocation needed for const map entries in * pvr_pds_generate_descriptor_upload_program(). @@ -781,7 +780,7 @@ static VkResult pvr_pds_descriptor_program_create_and_upload( vk_free2(&device->vk.alloc, allocator, entries_buffer); vk_free2(&device->vk.alloc, allocator, staging_buffer); - return vk_error(device, VK_ERROR_OUT_OF_HOST_MEMORY); + return result; } vk_free2(&device->vk.alloc, allocator, staging_buffer); -- 2.7.4