mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-02-17 22:05:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'linear-cursor-copy-vulkan' into 'master'

Browse source 
render/vulkan: support hardware cursors on nvidia+vulkan

See merge request wlroots/wlroots!5209
This commit is contained in:
khyperia 2026-02-01 22:43:04 +01:00
commit f869421f97
5 changed files with 221 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

17
include/render/vulkan.h
View file

@ -89,7 +89,7 @@ struct wlr_vk_format {
bool is_ycbcr;
};
extern const VkImageUsageFlags vulkan_render_usage, vulkan_shm_tex_usage, vulkan_dma_tex_usage;
extern const VkImageUsageFlags vulkan_render_usage, vulkan_render_bridged_usage, vulkan_shm_tex_usage, vulkan_dma_tex_usage;
// Returns all known format mappings.
// Might not be supported for gpu/usecase.
@ -100,6 +100,7 @@ struct wlr_vk_format_modifier_props {
VkDrmFormatModifierPropertiesEXT props;
VkExtent2D max_extent;
bool has_mutable_srgb;
bool render_needs_bridge;
};
struct wlr_vk_format_props {
@ -233,6 +234,7 @@ struct wlr_vk_render_buffer {
VkDeviceMemory memories[WLR_DMABUF_MAX_PLANES];
uint32_t mem_count;
bool has_bridge;
VkImage image;
// Framebuffer and image view for rendering directly onto the buffer image,
@ -264,6 +266,17 @@ struct wlr_vk_render_buffer {
struct wlr_vk_descriptor_pool *blend_attachment_pool;
bool blend_transitioned;
} two_pass;
// Sometimes, we want to output to a buffer that cannot be used as a
// COLOR_ATTACHMENT, but can be used as a TRANSFER_DST. So, render to an
// intermediate bridge buffer, then transfer it to the real output. In
// this case, the image field above is the fake intermediate buffer, and
// bridge.image is the real output.
struct {
VkImage image;
VkDeviceMemory memory;
bool transitioned;
} bridge;
};
bool vulkan_setup_one_pass_framebuffer(struct wlr_vk_render_buffer *buffer,
@ -514,7 +527,7 @@ struct wlr_vk_texture *vulkan_get_texture(struct wlr_texture *wlr_texture);
VkImage vulkan_import_dmabuf(struct wlr_vk_renderer *renderer,
const struct wlr_dmabuf_attributes *attribs,
VkDeviceMemory mems[static WLR_DMABUF_MAX_PLANES], uint32_t *n_mems,
bool for_render, bool *using_mutable_srgb);
bool for_render, bool *render_needs_bridge, bool *using_mutable_srgb);
struct wlr_texture *vulkan_texture_from_buffer(
struct wlr_renderer *wlr_renderer, struct wlr_buffer *buffer);
void vulkan_texture_destroy(struct wlr_vk_texture *texture);