X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvulkan%2Fvkutil.h;h=775fd2735d1775ef4bc68f90b6d2d41ed46e7631;hb=75b8713addd14a845e2fa8ad9a9d3d4a6a323bec;hp=f9cbf94835d0b0adc0d3a73c93d34ec57d60a097;hpb=9148ff7614b1dc22fd5d1dcf6d74e2fb4ff13706;p=demo

diff --git a/src/vulkan/vkutil.h b/src/vulkan/vkutil.h
index f9cbf94..775fd27 100644
--- a/src/vulkan/vkutil.h
+++ b/src/vulkan/vkutil.h
@@ -2,18 +2,18 @@
 #define VKUTIL_H_
 
 #include <vulkan/vulkan.h>
+#include <vector>
 
-extern VkSwapchainKHR vkswapchain;
-extern VkImage *vkswapchain_images;
-extern VkSurfaceKHR vksurface;
-extern VkInstance vkinst;
-extern VkPhysicalDevice vkpdev;
-extern VkDevice vkdev;
-extern VkQueue vkq;
-extern VkCommandPool vkcmdpool;
-extern VkCommandBuffer vkcmdbuf;	/* primary command buffer */
-extern int vkqfamily;
-extern int vknext_swapchain_image;
+extern VkPhysicalDevice vk_physical;
+extern VkDevice vk_device;
+extern VkCommandPool vk_pool;
+extern VkQueue vk_queue;
+extern VkSwapchainKHR vk_swapchain;
+extern VkSurfaceKHR vk_surface;
+extern VkInstance vk_instance;
+extern int vk_qfamily;
+extern VkDescriptorPool vk_dpool;
+extern VkRenderPass vk_renderpass;
 
 struct vku_buffer {
 	VkBuffer buf;
@@ -21,6 +21,45 @@ struct vku_buffer {
 	int mem_start, mem_size;
 };
 
+struct vku_descriptor {
+	VkDescriptorSetLayout layout;
+	VkDescriptorType type;
+	VkFlags stage_flags;
+	int binding_point;
+	int size;
+};
+
+struct vku_pipeline {
+};
+
+struct vku_pipeline_info {
+	/* shader stages */
+	VkShaderModule vs;
+	VkShaderModule fs;
+
+	/* states info */
+
+	VkPipelineShaderStageCreateInfo inf_shader_stage;
+
+	VkPipelineVertexInputStateCreateInfo inf_vertex_input;
+
+	VkPipelineInputAssemblyStateCreateInfo inf_input_asm;
+
+	VkPipelineTessellationStateCreateInfo inf_tessel;
+
+	VkPipelineViewportStateCreateInfo inf_viewport;
+	VkPipelineRasterizationStateCreateInfo inf_raster;
+	VkPipelineMultisampleStateCreateInfo inf_multisample;
+	VkPipelineDepthStencilStateCreateInfo inf_depth_stencil;
+	VkPipelineColorBlendStateCreateInfo inf_colorblend;
+
+	VkPipelineDynamicStateCreateInfo inf_dynamic_state;
+
+	VkPipelineLayout layout;
+	VkRenderPass renderpass;
+	uint32_t subpass;
+};
+
 /* extensions */
 bool vku_have_extension(const char *name);
 bool vku_have_device_extension(const char *name);
@@ -31,24 +70,24 @@ void vku_cleanup();
 
 /* command buffers */
 VkCommandBuffer vku_alloc_cmdbuf(VkCommandPool pool, VkCommandBufferLevel level);
+bool vku_alloc_cmdbufs(VkCommandPool pool, VkCommandBufferLevel level, unsigned int count, VkCommandBuffer *buf_array);
 void vku_free_cmdbuf(VkCommandPool pool, VkCommandBuffer buf);
 
 void vku_begin_cmdbuf(VkCommandBuffer buf, unsigned int flags);
 void vku_end_cmdbuf(VkCommandBuffer buf);
 void vku_reset_cmdbuf(VkCommandBuffer buf);
-
 void vku_submit_cmdbuf(VkQueue q, VkCommandBuffer buf, VkFence done_fence);
 
-/* swapchain */
-VkSwapchainKHR vku_create_swapchain(VkSurfaceKHR surf, int xsz, int ysz, int n,
-		VkPresentModeKHR pmode, VkSwapchainKHR prev);
-VkImage *vku_get_swapchain_images(VkSwapchainKHR sc, int *count);
+bool vku_get_surface_format(VkPhysicalDevice gpu, VkSurfaceKHR surface, VkSurfaceFormatKHR *sformat);
+VkColorSpaceKHR vku_get_surface_colorspace(VkPhysicalDevice gpu, VkSurfaceKHR surface);
+
 int vku_get_next_image(VkSwapchainKHR sc);
 void vku_present(VkSwapchainKHR sc, int img_idx);
 
 /* buffers */
 vku_buffer *vku_create_buffer(int sz, unsigned int usage);
 void vku_destroy_buffer(vku_buffer *buf);
+bool vku_update_buffer(vku_buffer *buf, int size, void *data);
 
 void vku_cmd_copybuf(VkCommandBuffer cmdbuf, VkBuffer dest, int doffs,
 	VkBuffer src, int soffs, int size);
@@ -56,4 +95,13 @@ void vku_cmd_copybuf(VkCommandBuffer cmdbuf, VkBuffer dest, int doffs,
 /* other */
 const char *vku_get_vulkan_error_str(VkResult error);
 
-#endif // VKUTIL_H_
\ No newline at end of file
+/* pipelines */
+vku_descriptor *vku_create_descriptor(VkDescriptorType type, VkFlags stage,
+		int binding_point, int size);
+void vku_destroy_descriptor(vku_descriptor *descriptor);
+
+bool vku_create_descriptor_pool(vku_descriptor **descriptors, int num_desc,
+		VkDescriptorSet set);
+void vku_destroy_descriptor_pool();
+
+#endif // VKUTIL_H_