some descriptor functions in vkutil - wip
[demo] / src / vulkan / vkutil.cc
index 35a85dd..c1ca1d5 100644 (file)
 /* global variables */
 VkPhysicalDevice vk_physical;
 VkDevice vk_device;
-VkCommandPool vk_pool;
+VkInstance vk_instance;
 VkQueue vk_queue;
+int vk_qfamily;
+VkCommandPool vk_pool;
 VkSurfaceKHR vk_surface;
 VkSwapchainKHR vk_swapchain;
-
-VkPipeline *vkgparent_pipeline;
-VkFramebuffer *vkfbufs;
-VkRenderPass vkrpass;
-VkInstance vkinst;
-VkCommandBuffer vkcmdbuf;      /* primary command buffer */
-int vkqfamily;
-
-VkSemaphore vk_img_avail_sema;
-VkSemaphore vk_rend_done_sema;
-VkImage *vkswapchain_images;
-VkImageView *vkswapchain_views;
-int vknum_swapchain_images;
-int vk_curr_swapchain_image;
+VkDescriptorPool vk_dpool;
 
 /* static functions */
 static const char *get_device_name_str(VkPhysicalDeviceType type);
@@ -132,17 +121,17 @@ bool vku_create_device()
        inst_info.ppEnabledExtensionNames = ext_names;
        inst_info.enabledExtensionCount = sizeof ext_names / sizeof *ext_names;
 
-       if(vkCreateInstance(&inst_info, 0, &vkinst) != 0) {
+       if(vkCreateInstance(&inst_info, 0, &vk_instance) != 0) {
                fprintf(stderr, "failed to create vulkan instance\n");
                return false;
        }
        printf("created vulkan instance\n");
-       if(vkEnumeratePhysicalDevices(vkinst, &num_devices, 0) != 0) {
+       if(vkEnumeratePhysicalDevices(vk_instance, &num_devices, 0) != 0) {
                fprintf(stderr, "failed to enumerate vulkan physical devices\n");
                return false;
        }
        phys_devices = new VkPhysicalDevice[num_devices];
-       if(vkEnumeratePhysicalDevices(vkinst, &num_devices, phys_devices) != 0) {
+       if(vkEnumeratePhysicalDevices(vk_instance, &num_devices, phys_devices) != 0) {
                fprintf(stderr, "failed to enumerate vulkan physical devices\n");
                return false;
        }
@@ -234,7 +223,7 @@ bool vku_create_device()
        printf("created device %d\n", sel_dev);
 
        vk_physical = phys_devices[sel_dev];
-       vkqfamily = sel_qfamily;
+       vk_qfamily = sel_qfamily;
 
        vkGetDeviceQueue(vk_device, sel_qfamily, 0, &vk_queue);
 
@@ -259,41 +248,19 @@ bool vku_create_device()
 
 void vku_cleanup()
 {
-       if(vkinst) {
+       if(vk_instance) {
                vkDeviceWaitIdle(vk_device);
                vkDestroyCommandPool(vk_device, vk_pool, 0);
 
-               vkDestroySemaphore(vk_device, vk_img_avail_sema, 0);
-               vkDestroySemaphore(vk_device, vk_rend_done_sema, 0);
-
                vkDestroyDevice(vk_device, 0);
-               vkDestroyInstance(vkinst, 0);
-               vkinst = 0;
+               vkDestroyInstance(vk_instance, 0);
+               vk_instance = 0;
        }
 
        delete [] phys_devices;
        phys_devices = 0;
 }
 
-bool vku_create_semaphores()
-{
-       VkSemaphoreCreateInfo sinf;
-       memset(&sinf, 0, sizeof sinf);
-
-       sinf.sType = VK_STRUCTURE_TYPE_SEMAPHORE_CREATE_INFO;
-       if(vkCreateSemaphore(vk_device, &sinf, 0, &vk_img_avail_sema) != VK_SUCCESS) {
-               fprintf(stderr, "Failed to create semaphore\n");
-               return false;
-       }
-
-       if(vkCreateSemaphore(vk_device, &sinf, 0, &vk_rend_done_sema) != VK_SUCCESS) {
-               fprintf(stderr, "Failed to create semaphore\n");
-               return false;
-       }
-
-       return true;
-}
-
 VkCommandBuffer vku_alloc_cmdbuf(VkCommandPool pool, VkCommandBufferLevel level)
 {
        VkCommandBuffer cmdbuf;
@@ -468,6 +435,19 @@ void vku_destroy_buffer(struct vku_buffer *buf)
        }
 }
 
+bool vku_update_buffer(vku_buffer *buf, int size, void *data)
+{
+       uint8_t *pdata;
+       if(vkMapMemory(vk_device, buf->mem_pool, 0, size, 0, (void**)&pdata) != VK_SUCCESS) {
+               fprintf(stderr, "Failed to map memory.\n");
+               return false;
+       }
+       memcpy(pdata, data, size);
+       vkUnmapMemory(vk_device, buf->mem_pool);
+
+       return true;
+}
+
 void vku_cmd_copybuf(VkCommandBuffer cmdbuf, VkBuffer dest, int doffs,
                      VkBuffer src, int soffs, int size)
 {
@@ -641,3 +621,108 @@ static const char *get_mem_size_str(long sz)
        sprintf(str, "%ld.%ld %s", sz / 10, sz % 10, unitstr[uidx]);
        return str;
 }
+
+vku_descriptor *vku_create_descriptor(VkDescriptorType type,
+               VkFlags stage, int binding_point,
+               int size, int num_desc)
+{
+       vku_descriptor *desc = new vku_descriptor;
+
+       desc->type = type;
+       desc->size = size;
+       desc->stage_flags = stage;
+       desc->binding_point = binding_point;
+
+       VkDescriptorSetLayoutBinding dslb;
+       memset(&dslb, 0, sizeof dslb);
+
+       dslb.binding = binding_point;
+       dslb.descriptorType = type;
+       dslb.descriptorCount = num_desc;
+       dslb.stageFlags = stage;
+
+       VkDescriptorSetLayoutCreateInfo dslinf;
+       memset(&dslinf, 0, sizeof dslinf);
+
+       dslinf.sType = VK_STRUCTURE_TYPE_PIPELINE_LAYOUT_CREATE_INFO;
+       dslinf.bindingCount = 1;
+       dslinf.pBindings = &dslb;
+
+       if(vkCreateDescriptorSetLayout(vk_device, &dslinf, 0, &desc->layout) != VK_SUCCESS) {
+               fprintf(stderr, "Failed to create vku_descriptor.\n");
+               return 0;
+       }
+
+       return desc;
+}
+
+void vku_destroy_descriptor(vku_descriptor *desc)
+{
+       vkDestroyDescriptorSetLayout(vk_device, desc->layout, 0);
+       delete desc;
+}
+
+bool vku_create_descriptor_pool(vku_descriptor **descriptors, int num_desc)
+{
+       if(vk_dpool)
+               vkDestroyDescriptorPool(vk_device, vk_dpool, 0);
+
+       VkDescriptorPoolCreateInfo dpinf;
+       memset(&dpinf, 0, sizeof dpinf);
+       dpinf.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_POOL_CREATE_INFO;
+       dpinf.maxSets = 1;
+
+       dpinf.poolSizeCount = num_desc;
+
+       std::vector<VkDescriptorPoolSize> sizes;
+       for(int i=0; i<num_desc; i++) {
+               VkDescriptorPoolSize psz;
+               psz.type = descriptors[i]->type;
+               psz.descriptorCount = 1;
+               sizes.push_back(psz);
+       }
+
+       dpinf.pPoolSizes = sizes.data();
+
+       if(vkCreateDescriptorPool(vk_device, &dpinf, 0, &vk_dpool) != VK_SUCCESS) {
+               fprintf(stderr, "Failed to create descriptor pool.\n");
+               return false;
+       }
+
+       return true;
+}
+
+void vku_destroy_descriptor_pool()
+{
+       vkDestroyDescriptorPool(vk_device, vk_dpool, 0);
+}
+
+bool vku_allocate_descriptor_sets(vku_descriptor **desc, int num_desc, VkDescriptorSet set)
+{
+       VkDescriptorSetAllocateInfo dainf;
+       memset(&dainf, 0, sizeof dainf);
+
+       dainf.sType = VK_STRUCTURE_TYPE_DESCRIPTOR_SET_ALLOCATE_INFO;
+       dainf.descriptorPool = vk_dpool;
+       dainf.descriptorSetCount = num_desc;
+
+       std::vector<VkDescriptorSetLayout> layouts;
+       for(int i=0; i<num_desc; i++) {
+               layouts.push_back(desc[i]->layout);
+       }
+
+       dainf.pSetLayouts = layouts.data();
+
+       if(vkAllocateDescriptorSets(vk_device, &dainf, &set) != VK_SUCCESS) {
+               fprintf(stderr, "Failed to allocate descriptor sets.\n");
+               return false;
+       }
+       return true;
+}
+
+void vku_free_descriptor_sets(VkDescriptorSet *sets, int num)
+{
+       vkFreeDescriptorSets(vk_device, vk_dpool, num, sets);
+}
+
+