mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: add upload thread

Browse source 
TODO:

- Update blocking stage submission as well
- Allow multiple data ptr accesses
- Stop abusing FDs for multi-thread queue
This commit is contained in:
Simon Ser 2023-11-24 20:01:40 +01:00
parent 79cbbfb366
commit fee8969955
6 changed files with 208 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

24
include/render/vulkan.h
View file

@ -1,6 +1,7 @@
#ifndef RENDER_VULKAN_H
#define RENDER_VULKAN_H
#include <pthread.h>
#include <stdint.h>
#include <string.h>
#include <stdbool.h>
@ -270,6 +271,12 @@ struct wlr_vk_renderer {
// Pool of command buffers
struct wlr_vk_command_buffer command_buffers[VULKAN_COMMAND_BUFFERS_CAP];
struct {
pthread_t thread;
int worker_fd, control_fd;
struct wl_event_source *event_source;
} upload;
struct {
struct wlr_vk_command_buffer *cb;
uint64_t last_timeline_point;
@ -301,6 +308,17 @@ struct wlr_vk_texture_view {
struct wlr_vk_descriptor_pool *ds_pool;
};
struct wlr_vk_upload_task {
struct wlr_buffer *buffer;
VkDeviceMemory memory;
uint64_t timeline_point;
char *dst;
const char *src;
uint32_t src_stride, dst_size;
pixman_region32_t region;
const struct wlr_pixel_format_info *format_info;
};
struct wlr_vk_pipeline *setup_get_or_create_pipeline(
struct wlr_vk_render_format_setup *setup,
const struct wlr_vk_pipeline_key *key);
@ -312,7 +330,8 @@ struct wlr_vk_texture_view *vulkan_texture_get_or_create_view(
const struct wlr_vk_pipeline_layout *layout);
// Creates a vulkan renderer for the given device.
struct wlr_renderer *vulkan_renderer_create_for_device(struct wlr_vk_device *dev);
struct wlr_renderer *vulkan_renderer_create_for_device(struct wlr_vk_device *dev,
struct wl_event_loop *loop);
// stage utility - for uploading/retrieving data
// Gets an command buffer in recording state which is guaranteed to be
@ -382,6 +401,9 @@ bool vulkan_read_pixels(struct wlr_vk_renderer *vk_renderer,
uint32_t width, uint32_t height, uint32_t src_x, uint32_t src_y,
uint32_t dst_x, uint32_t dst_y, void *data);
bool vulkan_init_upload_worker(struct wlr_vk_renderer *renderer,
struct wl_event_loop *loop);
// State (e.g. image texture) associated with a surface.
struct wlr_vk_texture {
struct wlr_texture wlr_texture;

3
include/wlr/render/vulkan.h
View file

@ -18,7 +18,8 @@ struct wlr_vk_image_attribs {
VkFormat format;
};
struct wlr_renderer *wlr_vk_renderer_create_with_drm_fd(int drm_fd);
struct wlr_renderer *wlr_vk_renderer_create_with_drm_fd(
struct wl_event_loop *loop, int drm_fd);
VkInstance wlr_vk_renderer_get_instance(struct wlr_renderer *renderer);
VkPhysicalDevice wlr_vk_renderer_get_physical_device(struct wlr_renderer *renderer);