X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fvulkan%2Fvk.cc;h=f5829ab13c53e95de8179357f3e2a5358cb973c4;hp=0e3725b32150a31678535480a9f9a5597a05974e;hb=8fb0cca684e078cd2537070c53ad970ebbc2e9a7;hpb=32feb79dc3b9ddeeab84a0329d53b8aaff86bb80 diff --git a/src/vulkan/vk.cc b/src/vulkan/vk.cc index 0e3725b..f5829ab 100644 --- a/src/vulkan/vk.cc +++ b/src/vulkan/vk.cc @@ -2,6 +2,7 @@ #include #include +#include #include #include #include @@ -9,14 +10,30 @@ #include +#include "allocator.h" #include "gfxapi.h" +#include "image.h" #include "vkutil.h" +#include "vk.h" /* global variables */ extern GLFWwindow *win; extern int win_w; extern int win_h; +static VkCommandBuffer cmd_buf; // command buffer used at zbuffer creation +//depth buffer +static VkImage dimg; +static VkImageView dview; +//swapchain +static VkImage *images; +static VkImageView *iviews; +static uint32_t num_images; + +/* static variables */ +static VkDeviceMemory gpu_mem; // to be replaced when I fix the allocator +// zbuffer image, view: + VkCommandBuffer *swapchain_cmd_bufs; /* static functions */ @@ -30,20 +47,16 @@ static void swapbuffers(); static void begin_drawing(); static void end_drawing(); -static bool create_swapchain_cmd_bufs(VkCommandPool vkcmdpool); +static bool create_swapchain(); +static bool begin_command_buffer(); +static bool create_swapchain_image_views(VkFormat format); +static bool create_zbuffer(); + +static bool create_swapchain_cmd_bufs(VkCommandPool vk_pool); static bool record_cmd_clear(float r, float g, float b); bool init_vulkan() { - gfx_clear = clear; - gfx_viewport = viewport; - gfx_zbuffer = zbuffer; - gfx_cull_face = cull_face; - gfx_reshape = reshape; - gfx_swapbuffers = swapbuffers; - gfx_begin_drawing = begin_drawing; - gfx_end_drawing = end_drawing; - if(!glfwInit()) { fprintf(stderr, "Failed to initialize GLFW.\n"); return false; @@ -54,14 +67,16 @@ bool init_vulkan() return false; } + //TODO: remove later glfwSetErrorCallback(error_callback); + /* create device and command pool! */ if(!vku_create_device()) { fprintf(stderr, "Failed to initialize vulkan.\n"); return false; } - if(!glfwGetPhysicalDevicePresentationSupport(vkinst, vkpdev, vkqfamily)) { + if(!glfwGetPhysicalDevicePresentationSupport(vkinst, vk_physical, vkqfamily)) { fprintf(stderr, "Presentation support not found.\n"); return false; } @@ -72,46 +87,326 @@ bool init_vulkan() return false; } - if(VkResult err = glfwCreateWindowSurface(vkinst, win, 0, &vksurface)) { - fprintf(stderr, "Failed to create KHR surface: %s\n", vku_get_vulkan_error_str(err)); + VkResult res = glfwCreateWindowSurface(vkinst, win, 0, &vk_surface); + if(res != VK_SUCCESS) { + fprintf(stderr, "Failed to create KHR surface: %s\n", vku_get_vulkan_error_str(res)); return false; } + if(!create_swapchain()) { + fprintf(stderr, "Failed to create swapchain.\n"); + return false; + } + + cmd_buf = VK_NULL_HANDLE; + if(!begin_command_buffer()) { + fprintf(stderr, "Failed to start VK_NULL_HANDLE command buffer.\n"); + return false; + } + + if(!create_zbuffer()) { + fprintf(stderr, "Failed to create depth buffer.\n"); + return false; + } + + gfx_clear = clear; + gfx_viewport = viewport; + gfx_zbuffer = zbuffer; + gfx_cull_face = cull_face; + gfx_reshape = reshape; + gfx_swapbuffers = swapbuffers; + gfx_begin_drawing = begin_drawing; + gfx_end_drawing = end_drawing; + + +/* if(!vku_create_semaphores()) return false; - if(!(vkswapchain = vku_create_swapchain(vksurface, win_w, win_h, 2, - VK_PRESENT_MODE_FIFO_KHR, 0))) { + if(!(vk_swapchain = vku_create_swapchain(vk_surface, win_w, win_h, 2, + VK_PRESENT_MODE_IMMEDIATE_KHR, 0))) { fprintf(stderr, "Failed to create swapchain.\n"); return false; } - vkswapchain_images = vku_get_swapchain_images(vkswapchain, &vknum_swapchain_images); + vkswapchain_images = vku_get_swapchain_images(vk_swapchain, &vknum_swapchain_images); if(!vkswapchain_images) { fprintf(stderr, "Failed to get swapchain images.\n"); return false; } - /* vkswapchain_views = vku_create_image_views(vkswapchain_images, vknum_swapchain_images); - if(!vkswapchain_views) { - fprintf(stderr, "Failed to create swapchain image views.\n"); - delete [] vkswapchain_images; +// vkswapchain_views = vku_create_image_views(vkswapchain_images, vknum_swapchain_images); +// if(!vkswapchain_views) { +// fprintf(stderr, "Failed to create swapchain image views.\n"); +// delete [] vkswapchain_images; +// return false; +// } + + if(!create_swapchain_cmd_bufs(vk_pool)) { + return false; + } + + if(!record_cmd_clear(1.0, 0.1, 0.1)) + return false; + */ + + return true; +} + +static bool create_swapchain() +{ + /* surface capabilities */ + VkSurfaceCapabilitiesKHR scap; + if(vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical, vk_surface, &scap) != VK_SUCCESS) { + fprintf(stderr, "Failed to get physical device surface capabilities\n"); + return false; + } + + /* presentation modes */ + uint32_t prmode_cnt; + if(vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical, vk_surface, &prmode_cnt, 0) != VK_SUCCESS) { + fprintf(stderr, "Failed to get physical device surface presentation modes count.\n"); + return false; + } + + if(prmode_cnt == 0) { + fprintf(stderr, "Presentation modes not found.\n"); + return false; + } + + VkPresentModeKHR scmode = VK_PRESENT_MODE_FIFO_KHR; + VkPresentModeKHR *modes = new VkPresentModeKHR[prmode_cnt]; + + if(vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical, vk_surface, &prmode_cnt, modes) != VK_SUCCESS) { + fprintf(stderr, "Failed to get physical device presentation modes.\n"); + return false; + } + + for(uint32_t i=0; i 0 && num_images > scap.maxImageCount) + num_images = scap.maxImageCount; + + printf("num_images : %u\n", num_images); + assert(num_images > 0); + + /* transform flags */ + VkSurfaceTransformFlagBitsKHR pre_transf = scap.currentTransform; + if(scap.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) + pre_transf = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; + + /* find suitable colorspace, format */ + uint32_t fcount; + if(vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical, vk_surface, &fcount, 0) != VK_SUCCESS) { + fprintf(stderr, "Failed to get format count for physical device.\n"); + return false; + } + if(fcount == 0) { + fprintf(stderr, "No color formats were found.\n"); + return false; + } + + VkFormat format; + VkColorSpaceKHR colorspace; + + VkSurfaceFormatKHR *formats = new VkSurfaceFormatKHR[fcount]; + if(vkGetPhysicalDeviceSurfaceFormatsKHR(vk_physical, vk_surface, &fcount, formats) != VK_SUCCESS) { + fprintf(stderr, "Failed to get surface formats.\n"); + return false; + } + if((fcount == 1) && (formats[0].format == VK_FORMAT_UNDEFINED)) { + format = VK_FORMAT_B8G8R8_UNORM; + } else { + format = formats[0].format; + } + colorspace = formats[0].colorSpace; + + /* creating the swapchain */ + VkSwapchainCreateInfoKHR sinfo; + memset(&sinfo, 0, sizeof sinfo); + + sinfo.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; + sinfo.surface = vk_surface; + sinfo.minImageCount = num_images; + sinfo.imageFormat = format; + sinfo.imageColorSpace = colorspace; + sinfo.imageExtent = scextent; + sinfo.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; + sinfo.preTransform = pre_transf; + sinfo.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; + sinfo.imageArrayLayers = 1; + sinfo.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; + sinfo.presentMode = scmode; + sinfo.oldSwapchain = VK_NULL_HANDLE; //TODO + sinfo.clipped = VK_TRUE; //TODO + + if(vkCreateSwapchainKHR(vk_device, &sinfo, 0, &vk_swapchain) != VK_SUCCESS) { + fprintf(stderr, "Failed to create swapchain.\n"); + return false; + } + + if(vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &num_images, 0) != VK_SUCCESS) { + fprintf(stderr, "Failed to get the number of the swapchain images.\n"); + return false; + } + + images = new VkImage[num_images]; + if(vkGetSwapchainImagesKHR(vk_device, vk_swapchain, &num_images, images) != VK_SUCCESS) { + fprintf(stderr, "Failed to get the swapchain images.\n"); + return false; + } + assert(images); + + if(!create_swapchain_image_views(format)) { + fprintf(stderr, "Failed to create image views for the swapchain images.\n"); + return false; + } + + // create renderpass + + + return true; +} + +static bool create_swapchain_image_views(VkFormat format) +{ + VkImageViewCreateInfo ivinf; + memset(&ivinf, 0, sizeof ivinf); + + ivinf.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO; + ivinf.format = format; + ivinf.components = { + VK_COMPONENT_SWIZZLE_R, + VK_COMPONENT_SWIZZLE_G, + VK_COMPONENT_SWIZZLE_B, + VK_COMPONENT_SWIZZLE_A + }; + ivinf.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + ivinf.subresourceRange.levelCount = 1; + ivinf.subresourceRange.layerCount = 1; + ivinf.viewType = VK_IMAGE_VIEW_TYPE_2D; + + iviews = new VkImageView[num_images]; + for(uint32_t i=0; i