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

radv: remove alloc parameter from pipeline init

Browse Source 
clang points out this isn't used.

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
This commit is contained in:
Dave Airlie
2019-02-08 14:27:09 +10:00
parent a523ae0cac
commit 90c6880df7
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/amd/vulkan/radv_pipeline.c
View File

@@ -3543,8 +3543,7 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
struct radv_device *device, struct radv_device *device,
struct radv_pipeline_cache *cache, struct radv_pipeline_cache *cache,
const VkGraphicsPipelineCreateInfo *pCreateInfo, const VkGraphicsPipelineCreateInfo *pCreateInfo,
const struct radv_graphics_pipeline_create_info *extra, const struct radv_graphics_pipeline_create_info *extra)
const VkAllocationCallbacks *alloc)
{ {
VkResult result; VkResult result;
bool has_view_index = false; bool has_view_index = false;
@@ -3553,8 +3552,6 @@ radv_pipeline_init(struct radv_pipeline *pipeline,
struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass; struct radv_subpass *subpass = pass->subpasses + pCreateInfo->subpass;
if (subpass->view_mask) if (subpass->view_mask)
has_view_index = true; has_view_index = true;
if (alloc == NULL)
alloc = &device->alloc;
pipeline->device = device; pipeline->device = device;
pipeline->layout = radv_pipeline_layout_from_handle(pCreateInfo->layout); pipeline->layout = radv_pipeline_layout_from_handle(pCreateInfo->layout);
@@ -3682,7 +3679,7 @@ radv_graphics_pipeline_create(
return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY); return vk_error(device->instance, VK_ERROR_OUT_OF_HOST_MEMORY);
result = radv_pipeline_init(pipeline, device, cache, result = radv_pipeline_init(pipeline, device, cache,
pCreateInfo, extra, pAllocator); pCreateInfo, extra);
if (result != VK_SUCCESS) { if (result != VK_SUCCESS) {
radv_pipeline_destroy(device, pipeline, pAllocator); radv_pipeline_destroy(device, pipeline, pAllocator);
return result; return result;