X-Git-Url: https://eleni.mutantstargoat.com/git/?p=demo;a=blobdiff_plain;f=src%2Fvulkan%2Fvkutil.cc;h=65467c563a014ecb24a56ca8028fd71db3c7efaa;hp=25f3ad37996178a09ab42bc244262901a4719196;hb=8fb0cca684e078cd2537070c53ad970ebbc2e9a7;hpb=32feb79dc3b9ddeeab84a0329d53b8aaff86bb80 diff --git a/src/vulkan/vkutil.cc b/src/vulkan/vkutil.cc index 25f3ad3..65467c5 100644 --- a/src/vulkan/vkutil.cc +++ b/src/vulkan/vkutil.cc @@ -10,22 +10,22 @@ #include "vkutil.h" /* global variables */ +VkPhysicalDevice vk_physical; +VkDevice vk_device; +VkCommandPool vk_pool; +VkQueue vk_queue; +VkSurfaceKHR vk_surface; +VkSwapchainKHR vk_swapchain; VkPipeline *vkgparent_pipeline; VkFramebuffer *vkfbufs; VkRenderPass vkrpass; -VkSurfaceKHR vksurface; VkInstance vkinst; -VkPhysicalDevice vkpdev; -VkDevice vkdev; -VkQueue vkq; -VkCommandPool vkcmdpool; VkCommandBuffer vkcmdbuf; /* primary command buffer */ int vkqfamily; VkSemaphore vk_img_avail_sema; VkSemaphore vk_rend_done_sema; -VkSwapchainKHR vkswapchain; VkImage *vkswapchain_images; VkImageView *vkswapchain_views; int vknum_swapchain_images; @@ -200,7 +200,7 @@ bool vku_create_device() if(sel_dev < 0 || sel_qfamily < 0) { fprintf(stderr, "failed to find any device with a graphics-capable command queue\n"); - vkDestroyDevice(vkdev, 0); + vkDestroyDevice(vk_device, 0); return false; } @@ -226,16 +226,16 @@ bool vku_create_device() dev_info.enabledExtensionCount = sizeof devext_names / sizeof *devext_names; dev_info.ppEnabledExtensionNames = devext_names; - if(vkCreateDevice(phys_devices[sel_dev], &dev_info, 0, &vkdev) != 0) { + if(vkCreateDevice(phys_devices[sel_dev], &dev_info, 0, &vk_device) != 0) { fprintf(stderr, "failed to create device %d\n", sel_dev); return false; } printf("created device %d\n", sel_dev); - vkpdev = phys_devices[sel_dev]; + vk_physical = phys_devices[sel_dev]; vkqfamily = sel_qfamily; - vkGetDeviceQueue(vkdev, sel_qfamily, 0, &vkq); + vkGetDeviceQueue(vk_device, sel_qfamily, 0, &vk_queue); /* create command buffer pool */ memset(&cmdpool_info, 0, sizeof cmdpool_info); @@ -243,15 +243,15 @@ bool vku_create_device() cmdpool_info.flags = VK_COMMAND_POOL_CREATE_RESET_COMMAND_BUFFER_BIT; cmdpool_info.queueFamilyIndex = sel_qfamily; - if(vkCreateCommandPool(vkdev, &cmdpool_info, 0, &vkcmdpool) != 0) { - fprintf(stderr, "failed to get command quque!\n"); + if(vkCreateCommandPool(vk_device, &cmdpool_info, 0, &vk_pool) != 0) { + fprintf(stderr, "failed to get command queue!\n"); return false; } - if(!(vkcmdbuf = vku_alloc_cmdbuf(vkcmdpool, VK_COMMAND_BUFFER_LEVEL_PRIMARY))) { +/* if(!(vkcmdbuf = vku_alloc_cmdbuf(vk_pool, VK_COMMAND_BUFFER_LEVEL_PRIMARY))) { fprintf(stderr, "failed to create primary command buffer\n"); return false; - } + } */ return true; } @@ -259,13 +259,13 @@ bool vku_create_device() void vku_cleanup() { if(vkinst) { - vkDeviceWaitIdle(vkdev); - vkDestroyCommandPool(vkdev, vkcmdpool, 0); + vkDeviceWaitIdle(vk_device); + vkDestroyCommandPool(vk_device, vk_pool, 0); - vkDestroySemaphore(vkdev, vk_img_avail_sema, 0); - vkDestroySemaphore(vkdev, vk_rend_done_sema, 0); + vkDestroySemaphore(vk_device, vk_img_avail_sema, 0); + vkDestroySemaphore(vk_device, vk_rend_done_sema, 0); - vkDestroyDevice(vkdev, 0); + vkDestroyDevice(vk_device, 0); vkDestroyInstance(vkinst, 0); vkinst = 0; } @@ -280,12 +280,12 @@ bool vku_create_semaphores() memset(&sinf, 0, sizeof sinf); sinf.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO; - if(vkCreateSemaphore(vkdev, &sinf, 0, &vk_img_avail_sema) != VK_SUCCESS) { + if(vkCreateSemaphore(vk_device, &sinf, 0, &vk_img_avail_sema) != VK_SUCCESS) { fprintf(stderr, "Failed to create semaphore\n"); return false; } - if(vkCreateSemaphore(vkdev, &sinf, 0, &vk_rend_done_sema) != VK_SUCCESS) { + if(vkCreateSemaphore(vk_device, &sinf, 0, &vk_rend_done_sema) != VK_SUCCESS) { fprintf(stderr, "Failed to create semaphore\n"); return false; } @@ -304,7 +304,7 @@ VkCommandBuffer vku_alloc_cmdbuf(VkCommandPool pool, VkCommandBufferLevel level) inf.level = level; inf.commandBufferCount = 1; - if(vkAllocateCommandBuffers(vkdev, &inf, &cmdbuf) != 0) { + if(vkAllocateCommandBuffers(vk_device, &inf, &cmdbuf) != 0) { return 0; } return cmdbuf; @@ -312,7 +312,7 @@ VkCommandBuffer vku_alloc_cmdbuf(VkCommandPool pool, VkCommandBufferLevel level) void vku_free_cmdbuf(VkCommandPool pool, VkCommandBuffer buf) { - vkFreeCommandBuffers(vkdev, pool, 1, &buf); + vkFreeCommandBuffers(vk_device, pool, 1, &buf); } void vku_begin_cmdbuf(VkCommandBuffer buf, unsigned int flags) @@ -352,26 +352,49 @@ void vku_submit_cmdbuf(VkQueue q, VkCommandBuffer buf, VkFence done_fence) VkSwapchainKHR vku_create_swapchain(VkSurfaceKHR surf, int xsz, int ysz, int n, VkPresentModeKHR pmode, VkSwapchainKHR prev) { + VkSurfaceCapabilitiesKHR scap; + vkGetPhysicalDeviceSurfaceCapabilitiesKHR(vk_physical, surf, &scap); + + VkPhysicalDeviceMemoryProperties mprops; + vkGetPhysicalDeviceMemoryProperties(vk_physical, &mprops); + + uint32_t pmcnt; + vkGetPhysicalDeviceSurfacePresentModesKHR(vk_physical, surf, &pmcnt, 0); + VkPresentModeKHR scpm = VK_PRESENT_MODE_IMMEDIATE_KHR; + VkExtent2D scext; + scext.width = xsz; + scext.height = ysz; + +// VkSurfaceTransformFlagBitsKHR pretransf; +// if(scap.supportedTransforms & VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR) { +// pretransf = VK_SURFACE_TRANSFORM_IDENTITY_BIT_KHR; +// } else { +// pretransf = scap.currentTransform; +// } + VkSwapchainKHR sc; VkSwapchainCreateInfoKHR inf; + VkSurfaceFormatKHR sformat; + sformat.format = VK_FORMAT_B8G8R8A8_UNORM; + memset(&inf, 0, sizeof inf); inf.sType = VK_STRUCTURE_TYPE_SWAPCHAIN_CREATE_INFO_KHR; inf.surface = surf; inf.minImageCount = n; - inf.imageFormat = VK_FORMAT_B8G8R8A8_UNORM; /* TODO enumerate and choose */ - inf.imageColorSpace = VK_COLORSPACE_SRGB_NONLINEAR_KHR; - inf.imageExtent.width = xsz; - inf.imageExtent.height = ysz; + inf.imageFormat = sformat.format; /* TODO enumerate and choose */ + inf.imageColorSpace = sformat.colorSpace; + inf.imageExtent = scext; inf.imageArrayLayers = 1; inf.imageUsage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT; inf.imageSharingMode = VK_SHARING_MODE_EXCLUSIVE; /* XXX make this an option? */ inf.preTransform = VK_SURFACE_TRANSFORM_INHERIT_BIT_KHR; inf.compositeAlpha = VK_COMPOSITE_ALPHA_OPAQUE_BIT_KHR; inf.presentMode = pmode; - inf.oldSwapchain = prev; + inf.oldSwapchain = VK_NULL_HANDLE; + inf.clipped = VK_TRUE; - if(vkCreateSwapchainKHR(vkdev, &inf, 0, &sc) != 0) { + if(vkCreateSwapchainKHR(vk_device, &inf, 0, &sc) != 0) { return 0; } return sc; @@ -382,11 +405,11 @@ VkImage *vku_get_swapchain_images(VkSwapchainKHR sc, int *count) uint32_t nimg; VkImage *images; - if(vkGetSwapchainImagesKHR(vkdev, sc, &nimg, 0) != 0) { + if(vkGetSwapchainImagesKHR(vk_device, sc, &nimg, 0) != 0) { return 0; } images = new VkImage[nimg]; - vkGetSwapchainImagesKHR(vkdev, sc, &nimg, images); + vkGetSwapchainImagesKHR(vk_device, sc, &nimg, images); if(count) *count = (int)nimg; return images; @@ -411,7 +434,7 @@ VkImageView *vku_create_image_views(VkImage *images, int count) inf.subresourceRange.levelCount = 1; inf.subresourceRange.layerCount = 1; - if(vkCreateImageView(vkdev, &inf, 0, iviews) != 0) { + if(vkCreateImageView(vk_device, &inf, 0, iviews) != 0) { fprintf(stderr, "Failed to create image views.\n"); delete iviews; return 0; @@ -425,7 +448,7 @@ int vku_get_next_image(VkSwapchainKHR sc) { uint32_t next; - if(vkAcquireNextImageKHR(vkdev, sc, UINT64_MAX, 0, 0, &next) != 0) { + if(vkAcquireNextImageKHR(vk_device, sc, UINT64_MAX, 0, 0, &next) != 0) { return -1; } return (int)next; @@ -444,7 +467,7 @@ void vku_present(VkSwapchainKHR sc, int img_idx) inf.pImageIndices = &index; inf.pResults = &res; - vkQueuePresentKHR(vkq, &inf); + vkQueuePresentKHR(vk_queue, &inf); } bool vku_create_renderpass() @@ -497,7 +520,7 @@ bool vku_create_renderpass() inf.subpassCount = 1; inf.pSubpasses = &subpass_desc; - if(vkCreateRenderPass(vkdev, &inf, 0, &vkrpass) != VK_SUCCESS) { + if(vkCreateRenderPass(vk_device, &inf, 0, &vkrpass) != VK_SUCCESS) { return false; } @@ -521,7 +544,7 @@ bool vku_create_framebuffers(VkImageView *image_views, int count, int w, int h) inf.layers = 1; for(int i=0; ibuf) != 0) { + if(vkCreateBuffer(vk_device, &binfo, 0, &buf->buf) != 0) { fprintf(stderr, "failed to create %d byte buffer (usage: %x)\n", sz, usage); return 0; } @@ -554,7 +577,7 @@ struct vku_buffer *vku_create_buffer(int sz, unsigned int usage) void vku_destroy_buffer(struct vku_buffer *buf) { if(buf) { - vkDestroyBuffer(vkdev, buf->buf, 0); + vkDestroyBuffer(vk_device, buf->buf, 0); delete buf; } } @@ -679,13 +702,13 @@ bool vku_create_graphics_pipeline(VkPipelineLayout *layout) vs.scissorCount = 1; /* dynamic states: that can be changed later */ - std::vector ds_enabled; - ds_enabled.push_back(VK_DYNAMIC_STATE_VIEWPORT); +// std::vector ds_enabled; +// ds_enabled.push_back(VK_DYNAMIC_STATE_VIEWPORT); //ds_enabled.push_back(VK_DYNAMIC_STATE_SCISSOR); - VkPipelineDynamicStateCreateInfo ds; - ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; - ds.pDynamicStates = ds_enabled.data(); - ds.dynamicStateCount = static_cast(ds_enabled.size()); +// VkPipelineDynamicStateCreateInfo ds; +// ds.sType = VK_STRUCTURE_TYPE_PIPELINE_DYNAMIC_STATE_CREATE_INFO; +// ds.pDynamicStates = ds_enabled.data(); +// ds.dynamicStateCount = static_cast(ds_enabled.size()); /* depth tests */ VkPipelineDepthStencilStateCreateInfo dsi;