From a8ccf2531dd11a5aa60785fed14e61d243b74d5f Mon Sep 17 00:00:00 2001 From: twinaphex Date: Mon, 29 Feb 2016 17:21:40 +0100 Subject: [PATCH] Cleanups --- gfx/common/vulkan_common.c | 2 +- gfx/common/vulkan_common.h | 34 +++++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 12 deletions(-) diff --git a/gfx/common/vulkan_common.c b/gfx/common/vulkan_common.c index 672c1aa63a..f731bbb176 100644 --- a/gfx/common/vulkan_common.c +++ b/gfx/common/vulkan_common.c @@ -1092,7 +1092,6 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk, VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CmdSetScissor); VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CmdSetViewport); - VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CmdBindPipeline); VK_GET_INSTANCE_PROC_ADDR(vk, vk->context.instance, CreateRenderPass); @@ -1101,6 +1100,7 @@ bool vulkan_context_init(gfx_ctx_vulkan_data_t *vk, /* Pipelines */ 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, CreateCommandPool); diff --git a/gfx/common/vulkan_common.h b/gfx/common/vulkan_common.h index 4255bc4c5b..e887f510f0 100644 --- a/gfx/common/vulkan_common.h +++ b/gfx/common/vulkan_common.h @@ -133,32 +133,44 @@ typedef struct vulkan_context { struct vulkan_context_fp { - PFN_vkDestroyFence vkDestroyFence; + /* Fences */ PFN_vkCreateFence vkCreateFence; + PFN_vkDestroyFence vkDestroyFence; PFN_vkResetFences vkResetFences; PFN_vkWaitForFences vkWaitForFences; - PFN_vkDestroySemaphore vkDestroySemaphore; + + /* Semaphores */ PFN_vkCreateSemaphore vkCreateSemaphore; - PFN_vkCreateFramebuffer vkCreateFramebuffer; - PFN_vkCreateCommandPool vkCreateCommandPool; - PFN_vkGetDeviceQueue vkGetDeviceQueue; + PFN_vkDestroySemaphore vkDestroySemaphore; + + /* Images */ PFN_vkCreateImage vkCreateImage; PFN_vkDestroyImage vkDestroyImage; - PFN_vkCreateInstance vkCreateInstance; - PFN_vkCreateRenderPass vkCreateRenderPass; + PFN_vkCmdCopyImage vkCmdCopyImage; + + /* Queues */ + PFN_vkGetDeviceQueue vkGetDeviceQueue; + PFN_vkQueueWaitIdle vkQueueWaitIdle; + PFN_vkQueueSubmit vkQueueSubmit; + + /* Pipelines */ + PFN_vkCmdBindPipeline vkCmdBindPipeline; PFN_vkCreatePipelineLayout vkCreatePipelineLayout; PFN_vkCreatePipelineCache vkCreatePipelineCache; + + PFN_vkCreateFramebuffer vkCreateFramebuffer; + PFN_vkCreateCommandPool vkCreateCommandPool; + + PFN_vkCreateInstance vkCreateInstance; + PFN_vkCreateRenderPass vkCreateRenderPass; PFN_vkGetPhysicalDeviceFormatProperties vkGetPhysicalDeviceFormatProperties; PFN_vkEnumeratePhysicalDevices vkEnumeratePhysicalDevices; PFN_vkGetPhysicalDeviceProperties vkGetPhysicalDeviceProperties; PFN_vkGetPhysicalDeviceMemoryProperties vkGetPhysicalDeviceMemoryProperties; PFN_vkGetPhysicalDeviceQueueFamilyProperties vkGetPhysicalDeviceQueueFamilyProperties; - PFN_vkQueueWaitIdle vkQueueWaitIdle; - PFN_vkQueueSubmit vkQueueSubmit; - PFN_vkCmdCopyImage vkCmdCopyImage; PFN_vkCmdSetScissor vkCmdSetScissor; PFN_vkCmdSetViewport vkCmdSetViewport; - PFN_vkCmdBindPipeline vkCmdBindPipeline; + PFN_vkCmdDraw vkCmdDraw; PFN_vkCreateDevice vkCreateDevice; PFN_vkDestroyDevice vkDestroyDevice;