X-Git-Url: http://git.mutantstargoat.com?a=blobdiff_plain;f=src%2Fvk.h;h=58a88efa5df2f847eaf3a75f87983eb973e4c607;hb=739a8266145a78fdc015ac74c890474f023b1fd1;hp=259240b4839e1e6c4930f01eea2c16146ad7c7fc;hpb=9d56322eb3c2c9967ab988faeb26e86be9661e34;p=vkrt diff --git a/src/vk.h b/src/vk.h index 259240b..58a88ef 100644 --- a/src/vk.h +++ b/src/vk.h @@ -5,14 +5,15 @@ #include #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) + struct vk_ctx { VkInstance inst; + VkPhysicalDevice pdev; VkDevice dev; VkCommandPool cmd_pool; - VkCommandBuffer cmd_buf; VkQueue queue; int qfam_idx; @@ -21,21 +22,7 @@ struct vk_ctx uint8_t driverUUID[VK_UUID_SIZE]; }; -struct vk_swapchain -{ - VkSwapchainKHR swapchain; - VkSurfaceKHR surface; - VkSurfaceFormatKHR surf_fmt; - - /* image properties */ - VkFormat image_fmt; - VkExtent2D extent2d; - - uint32_t num_images; - struct vk_image_obj *images; -}; - -struct vk_image_props +struct vk_att_props { uint32_t w; uint32_t h; @@ -52,9 +39,30 @@ struct vk_image_props VkImageLayout in_layout; VkImageLayout end_layout; + bool is_depth; + bool is_swapchain; bool need_export; }; +struct vk_swapchain +{ + VkSwapchainKHR swapchain; + VkSurfaceFormatKHR surf_fmt; + + /* image properties */ + /* FIXME: do I really need those 2?*/ + VkFormat image_fmt; + VkExtent2D extent2d; + + struct vk_att_props img_props; + + uint32_t num_images; + VkImage *images; + VkImageView *views; +}; + +/* for allocated images */ + struct vk_mem_obj { VkDeviceMemory mem; VkDeviceSize mem_sz; @@ -69,9 +77,9 @@ struct vk_image_obj { struct vk_mem_obj mobj; }; -struct vk_image_attachment { +struct vk_attachment { struct vk_image_obj obj; - struct vk_image_props props; + struct vk_att_props props; }; struct vk_vertex_info @@ -95,7 +103,6 @@ struct vk_renderer VkRenderPass renderpass; VkShaderModule vs; VkShaderModule fs; - VkFramebuffer fb; struct vk_vertex_info vertex_info; }; @@ -112,23 +119,44 @@ struct vk_semaphores VkSemaphore frame_done; }; +#ifdef __cplusplus +extern "C" { +#endif + /* context */ -bool vk_init_ctx(struct vk_ctx *ctx); -bool vk_init_ctx_for_rendering(struct vk_ctx *ctx); +bool vk_init_ctx(struct vk_ctx *ctx, + bool enable_layers); + +bool vk_init_ctx_for_rendering(struct vk_ctx *ctx, + bool enable_cache, + bool enable_layers); + void vk_cleanup_ctx(struct vk_ctx *ctx); /* images */ +bool +vk_create_ext_image(struct vk_ctx *ctx, + struct vk_att_props *props, + struct vk_image_obj *img); bool vk_create_image(struct vk_ctx *ctx, - struct vk_image_props *props, + struct vk_att_props *props, struct vk_image_obj *img_obj); void vk_destroy_image(struct vk_ctx *ctx, struct vk_image_obj *img_obj); bool +vk_create_image_view(struct vk_ctx *ctx, + VkImage image, + VkImageViewType view_type, + VkFormat format, + bool is_swapchain, + VkImageView *image_view); + +bool vk_fill_image_props(struct vk_ctx *ctx, uint32_t w, uint32_t h, uint32_t depth, @@ -139,15 +167,19 @@ vk_fill_image_props(struct vk_ctx *ctx, VkImageTiling tiling, VkImageLayout in_layout, VkImageLayout end_layout, + bool is_swapchain, + bool is_depth, bool need_export, - struct vk_image_props *props); + struct vk_att_props *props); -bool -vk_create_attachment_from_swapchain_image(struct vk_ctx *ctx, - VkImage *swapchain_img, - VkImageView *swapchain_view, - struct vk_image_props *swapchain_props, - struct vk_image_attachment *color_att); +struct vk_attachment +vk_create_attachment_from_obj(struct vk_image_obj *obj, + struct vk_att_props *props); + +struct vk_attachment +vk_create_attachment(VkImage image, + VkImageView view, + struct vk_att_props *props); /* buffers */ @@ -184,18 +216,27 @@ void vk_destroy_semaphores(struct vk_ctx *ctx, struct vk_semaphores *semaphores); -bool -vk_create_fences(struct vk_ctx *ctx, - int num_cmd_buf, - VkFenceCreateFlagBits flags, - VkFence *fences); - void vk_destroy_fences(struct vk_ctx *ctc, int num_fences, VkFence *fences); /* renderer */ +bool +vk_create_framebuffer(struct vk_ctx *ctx, + int width, int height, + int num_color_atts, + VkImageView *color_views, + VkImageView *depth_view, + VkRenderPass rb, + VkFramebuffer *fb); + +bool +vk_create_renderpass(struct vk_ctx *ctx, + uint32_t num_color_atts, + struct vk_att_props *color_props, + struct vk_att_props *depth_props, + VkRenderPass *renderpass); bool vk_create_renderer(struct vk_ctx *ctx, @@ -203,10 +244,13 @@ vk_create_renderer(struct vk_ctx *ctx, unsigned int vs_size, const char *fs_src, unsigned int fs_size, + int w, int h, + uint32_t num_samples, bool enable_depth, bool enable_stencil, - struct vk_image_attachment *color_att, - struct vk_image_attachment *depth_att, + int num_color_att, + struct vk_att_props *color_props, + struct vk_att_props *depth_props, struct vk_vertex_info *vert_info, struct vk_renderer *renderer); @@ -214,31 +258,60 @@ void vk_destroy_renderer(struct vk_ctx *ctx, struct vk_renderer *pipeline); -/* draw */ +/* fences and command buffers */ +bool +vk_create_fence(struct vk_ctx *ctx, + VkFence *fence); + +VkCommandBuffer +vk_create_cmd_buffer(struct vk_ctx *ctx); + +bool +vk_record_cmd_buffer(struct vk_ctx *ctx, + VkCommandBuffer cmd_buf, + struct vk_renderer *renderer, + struct vk_buf *vbo, + uint32_t vk_fb_color_count, + float *vk_fb_color, + VkFramebuffer fb, + uint32_t num_atts, + struct vk_attachment *atts, + float x, float y, + float w, float h); void +vk_destroy_cmd_buffers(struct vk_ctx *ctx, + uint32_t num_buffers, + VkCommandBuffer *buffers); + +/* draw */ +void vk_draw(struct vk_ctx *ctx, - struct vk_buf *vbo, - struct vk_renderer *renderer, - float *vk_fb_color, - uint32_t vk_fb_color_count, struct vk_semaphores *semaphores, - struct vk_image_attachment *attachments, - uint32_t n_attachments, - float x, float y, float w, float h); + uint32_t num_buffers, + VkCommandBuffer *cmd_buf); void vk_clear_color(struct vk_ctx *ctx, + VkCommandBuffer cmd_buf, struct vk_buf *vbo, struct vk_renderer *renderer, float *vk_fb_color, uint32_t vk_fb_color_count, + VkFramebuffer fb, struct vk_semaphores *semaphores, bool has_wait, bool has_signal, - struct vk_image_attachment *attachments, + struct vk_attachment *attachments, uint32_t n_attachments, float x, float y, float w, float h); +void +vk_set_viewport(struct vk_ctx *ctx, + VkCommandBuffer cmd_buf, + float x, float y, + float w, float h, + float near, float far); + /* swapchain */ bool @@ -252,20 +325,32 @@ void vk_destroy_swapchain(struct vk_ctx *ctx, struct vk_swapchain *swapchain); +bool +vk_queue_present(struct vk_swapchain *swapchain, + VkQueue queue, + uint32_t image_idx, + VkSemaphore wait_sema); + /* transitions */ void vk_copy_image_to_buffer(struct vk_ctx *ctx, - struct vk_image_attachment *src_img, + VkCommandBuffer cmd_buf, + struct vk_attachment *src_img, struct vk_buf *dst_bo, float w, float h); void -vk_transition_image_layout(struct vk_image_attachment *img_att, +vk_transition_image_layout(struct vk_attachment *img_att, VkCommandBuffer cmd_buf, VkImageLayout old_layout, VkImageLayout new_layout, uint32_t src_queue_family_index, uint32_t dst_queue_family_index); + +#ifdef __cplusplus +} +#endif + #endif /* VK_H */