From 68cbd743360cdce1f527f4501386f6fd16fe6165 Mon Sep 17 00:00:00 2001 From: plapins Date: Sun, 1 May 2016 22:11:40 +0200 Subject: [PATCH] Refactored ListOfFunctions.inl file: divided functions into tutorials in which they are first used. --- Project/Common/ListOfFunctions.inl | 99 ++++++++++++++++-------------- 1 file changed, 53 insertions(+), 46 deletions(-) diff --git a/Project/Common/ListOfFunctions.inl b/Project/Common/ListOfFunctions.inl index cf40dd0..2b93d0a 100644 --- a/Project/Common/ListOfFunctions.inl +++ b/Project/Common/ListOfFunctions.inl @@ -34,9 +34,11 @@ VK_EXPORTED_FUNCTION( vkGetInstanceProcAddr ) #define VK_GLOBAL_LEVEL_FUNCTION( fun ) #endif +// Tutorial 01 VK_GLOBAL_LEVEL_FUNCTION( vkCreateInstance ) + +// Tutorial 02 VK_GLOBAL_LEVEL_FUNCTION( vkEnumerateInstanceExtensionProperties ) -VK_GLOBAL_LEVEL_FUNCTION( vkEnumerateInstanceLayerProperties ) #undef VK_GLOBAL_LEVEL_FUNCTION @@ -52,22 +54,23 @@ VK_GLOBAL_LEVEL_FUNCTION( vkEnumerateInstanceLayerProperties ) #define VK_INSTANCE_LEVEL_FUNCTION( fun ) #endif -VK_INSTANCE_LEVEL_FUNCTION( vkDestroyInstance ) +// Tutorial 01 VK_INSTANCE_LEVEL_FUNCTION( vkEnumeratePhysicalDevices ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceProperties ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceFeatures ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceQueueFamilyProperties ) VK_INSTANCE_LEVEL_FUNCTION( vkCreateDevice ) VK_INSTANCE_LEVEL_FUNCTION( vkGetDeviceProcAddr ) +VK_INSTANCE_LEVEL_FUNCTION( vkDestroyInstance ) + +// Tutorial 02 VK_INSTANCE_LEVEL_FUNCTION( vkEnumerateDeviceExtensionProperties ) -VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceMemoryProperties ) -// From extensions #if defined(USE_SWAPCHAIN_EXTENSIONS) -VK_INSTANCE_LEVEL_FUNCTION( vkDestroySurfaceKHR ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceSurfaceSupportKHR ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceSurfaceCapabilitiesKHR ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceSurfaceFormatsKHR ) VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceSurfacePresentModesKHR ) +VK_INSTANCE_LEVEL_FUNCTION( vkDestroySurfaceKHR ) #if defined(VK_USE_PLATFORM_WIN32_KHR) VK_INSTANCE_LEVEL_FUNCTION( vkCreateWin32SurfaceKHR ) #elif defined(VK_USE_PLATFORM_XCB_KHR) @@ -77,6 +80,9 @@ VK_INSTANCE_LEVEL_FUNCTION( vkCreateXlibSurfaceKHR ) #endif #endif +// Tutorial 04 +VK_INSTANCE_LEVEL_FUNCTION( vkGetPhysicalDeviceMemoryProperties ) + #undef VK_INSTANCE_LEVEL_FUNCTION @@ -90,63 +96,64 @@ VK_INSTANCE_LEVEL_FUNCTION( vkCreateXlibSurfaceKHR ) #define VK_DEVICE_LEVEL_FUNCTION( fun ) #endif +// Tutorial 01 VK_DEVICE_LEVEL_FUNCTION( vkGetDeviceQueue ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyDevice ) VK_DEVICE_LEVEL_FUNCTION( vkDeviceWaitIdle ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyDevice ) + +// Tutorial 02 +VK_DEVICE_LEVEL_FUNCTION( vkCreateSemaphore ) VK_DEVICE_LEVEL_FUNCTION( vkCreateCommandPool ) VK_DEVICE_LEVEL_FUNCTION( vkAllocateCommandBuffers ) VK_DEVICE_LEVEL_FUNCTION( vkBeginCommandBuffer ) VK_DEVICE_LEVEL_FUNCTION( vkCmdPipelineBarrier ) VK_DEVICE_LEVEL_FUNCTION( vkCmdClearColorImage ) VK_DEVICE_LEVEL_FUNCTION( vkEndCommandBuffer ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateSemaphore ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroySemaphore ) VK_DEVICE_LEVEL_FUNCTION( vkQueueSubmit ) VK_DEVICE_LEVEL_FUNCTION( vkFreeCommandBuffers ) VK_DEVICE_LEVEL_FUNCTION( vkDestroyCommandPool ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateRenderPass ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyRenderPass ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateImageView ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyImageView ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateFramebuffer ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyFramebuffer ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateShaderModule ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyShaderModule ) -VK_DEVICE_LEVEL_FUNCTION( vkCreatePipelineLayout ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyPipelineLayout ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateGraphicsPipelines ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyPipeline ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdBeginRenderPass ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdEndRenderPass ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdBindPipeline ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdDraw ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateImage ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdCopyImage ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyImage ) -VK_DEVICE_LEVEL_FUNCTION( vkGetImageMemoryRequirements ) -VK_DEVICE_LEVEL_FUNCTION( vkAllocateMemory ) -VK_DEVICE_LEVEL_FUNCTION( vkBindImageMemory ) -VK_DEVICE_LEVEL_FUNCTION( vkFreeMemory ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateBuffer ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyBuffer ) -VK_DEVICE_LEVEL_FUNCTION( vkGetBufferMemoryRequirements ) -VK_DEVICE_LEVEL_FUNCTION( vkBindBufferMemory ) -VK_DEVICE_LEVEL_FUNCTION( vkMapMemory ) -VK_DEVICE_LEVEL_FUNCTION( vkUnmapMemory ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdBindVertexBuffers ) -VK_DEVICE_LEVEL_FUNCTION( vkCreateFence ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroyFence ) -VK_DEVICE_LEVEL_FUNCTION( vkResetFences ) -VK_DEVICE_LEVEL_FUNCTION( vkWaitForFences ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdSetViewport ) -VK_DEVICE_LEVEL_FUNCTION( vkCmdSetScissor ) -// From extensions +VK_DEVICE_LEVEL_FUNCTION( vkDestroySemaphore ) #if defined(USE_SWAPCHAIN_EXTENSIONS) VK_DEVICE_LEVEL_FUNCTION( vkCreateSwapchainKHR ) -VK_DEVICE_LEVEL_FUNCTION( vkDestroySwapchainKHR ) VK_DEVICE_LEVEL_FUNCTION( vkGetSwapchainImagesKHR ) VK_DEVICE_LEVEL_FUNCTION( vkAcquireNextImageKHR ) VK_DEVICE_LEVEL_FUNCTION( vkQueuePresentKHR ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroySwapchainKHR ) #endif +// Tutorial 03 +VK_DEVICE_LEVEL_FUNCTION( vkCreateImageView ) +VK_DEVICE_LEVEL_FUNCTION( vkCreateRenderPass ) +VK_DEVICE_LEVEL_FUNCTION( vkCreateFramebuffer ) +VK_DEVICE_LEVEL_FUNCTION( vkCreateShaderModule ) +VK_DEVICE_LEVEL_FUNCTION( vkCreatePipelineLayout ) +VK_DEVICE_LEVEL_FUNCTION( vkCreateGraphicsPipelines ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdBeginRenderPass ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdBindPipeline ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdDraw ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdEndRenderPass ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyShaderModule ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyPipelineLayout ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyPipeline ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyRenderPass ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyFramebuffer ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyImageView ) + +// Tutorial 04 +VK_DEVICE_LEVEL_FUNCTION( vkCreateFence ) +VK_DEVICE_LEVEL_FUNCTION( vkCreateBuffer ) +VK_DEVICE_LEVEL_FUNCTION( vkGetBufferMemoryRequirements ) +VK_DEVICE_LEVEL_FUNCTION( vkAllocateMemory ) +VK_DEVICE_LEVEL_FUNCTION( vkBindBufferMemory ) +VK_DEVICE_LEVEL_FUNCTION( vkMapMemory ) +VK_DEVICE_LEVEL_FUNCTION( vkUnmapMemory ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdSetViewport ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdSetScissor ) +VK_DEVICE_LEVEL_FUNCTION( vkCmdBindVertexBuffers ) +VK_DEVICE_LEVEL_FUNCTION( vkWaitForFences ) +VK_DEVICE_LEVEL_FUNCTION( vkResetFences ) +VK_DEVICE_LEVEL_FUNCTION( vkFreeMemory ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyBuffer ) +VK_DEVICE_LEVEL_FUNCTION( vkDestroyFence ) + #undef VK_DEVICE_LEVEL_FUNCTION \ No newline at end of file