Go through funcptr for vkDestroyPipeline

This commit is contained in:
twinaphex 2016-02-29 19:41:25 +01:00
parent d45f0e0946
commit f0458495f4
3 changed files with 9 additions and 3 deletions

View File

@ -1158,6 +1158,7 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk,
VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CreatePipelineLayout);
VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CreatePipelineCache);
VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CmdBindPipeline);
VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, DestroyPipeline);
VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CreateCommandPool);

View File

@ -157,6 +157,7 @@ typedef struct vulkan_context
PFN_vkCmdBindPipeline vkCmdBindPipeline;
PFN_vkCreatePipelineLayout vkCreatePipelineLayout;
PFN_vkCreatePipelineCache vkCreatePipelineCache;
PFN_vkDestroyPipeline vkDestroyPipeline;
/* Descriptor pools */
PFN_vkCreateDescriptorPool vkCreateDescriptorPool;

View File

@ -558,10 +558,14 @@ static void vulkan_deinit_pipelines(
unsigned i;
vulkan_deinit_pipeline_layout(vkcfp, vk);
vkDestroyPipeline(vk->context->device, vk->pipelines.alpha_blend, NULL);
vkDestroyPipeline(vk->context->device, vk->pipelines.font, NULL);
VKFUNC(vkDestroyPipeline)(vk->context->device,
vk->pipelines.alpha_blend, NULL);
VKFUNC(vkDestroyPipeline)(vk->context->device,
vk->pipelines.font, NULL);
for (i = 0; i < 4; i++)
vkDestroyPipeline(vk->context->device, vk->display.pipelines[i], NULL);
VKFUNC(vkDestroyPipeline)(vk->context->device,
vk->display.pipelines[i], NULL);
}
static void vulkan_deinit_framebuffers(