mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-03-20 05:35:12 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: introduce wlr_vk_render_buffer_out

Browse source 
Holds common state for final output buffer targets.
This commit is contained in:
Simon Ser 2025-06-21 17:39:42 +02:00
parent 6fee3623e4
commit a91f96b391
3 changed files with 31 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

16
include/render/vulkan.h
View file

@ -204,6 +204,13 @@ struct wlr_vk_render_format_setup {
struct wl_list pipelines; // struct wlr_vk_pipeline.link struct wl_list pipelines; // struct wlr_vk_pipeline.link
}; };
// Final output framebuffer and image view
struct wlr_vk_render_buffer_out {
VkImageView image_view;
VkFramebuffer framebuffer;
bool transitioned;
};
// Renderer-internal represenation of an wlr_buffer imported for rendering. // Renderer-internal represenation of an wlr_buffer imported for rendering.
struct wlr_vk_render_buffer { struct wlr_vk_render_buffer {
struct wlr_buffer *wlr_buffer; struct wlr_buffer *wlr_buffer;
@ -219,22 +226,17 @@ struct wlr_vk_render_buffer {
// This requires that the image support an _SRGB VkFormat, and does // This requires that the image support an _SRGB VkFormat, and does
// not work with color transforms. // not work with color transforms.
struct { struct {
struct wlr_vk_render_buffer_out out;
struct wlr_vk_render_format_setup *render_setup; struct wlr_vk_render_format_setup *render_setup;
VkImageView image_view;
VkFramebuffer framebuffer;
bool transitioned;
} srgb; } srgb;
// Framebuffer, image view, and blending image to render indirectly // Framebuffer, image view, and blending image to render indirectly
// onto the buffer image. This works for general image types and permits // onto the buffer image. This works for general image types and permits
// color transforms. // color transforms.
struct { struct {
struct wlr_vk_render_buffer_out out;
struct wlr_vk_render_format_setup *render_setup; struct wlr_vk_render_format_setup *render_setup;
VkImageView image_view;
VkFramebuffer framebuffer;
bool transitioned;
VkImage blend_image; VkImage blend_image;
VkImageView blend_image_view; VkImageView blend_image_view;
VkDeviceMemory blend_memory; VkDeviceMemory blend_memory;

16
render/vulkan/pass.c
View file

@ -399,14 +399,14 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
// also add acquire/release barriers for the current render buffer // also add acquire/release barriers for the current render buffer
VkImageLayout src_layout = VK_IMAGE_LAYOUT_GENERAL; VkImageLayout src_layout = VK_IMAGE_LAYOUT_GENERAL;
if (pass->srgb_pathway) { if (pass->srgb_pathway) {
if (!render_buffer->srgb.transitioned) { if (!render_buffer->srgb.out.transitioned) {
src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED; src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED;
render_buffer->srgb.transitioned = true; render_buffer->srgb.out.transitioned = true;
} }
} else { } else {
if (!render_buffer->two_pass.transitioned) { if (!render_buffer->two_pass.out.transitioned) {
src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED; src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED;
render_buffer->two_pass.transitioned = true; render_buffer->two_pass.out.transitioned = true;
} }
// The render pass changes the blend image layout from // The render pass changes the blend image layout from
// color attachment to read only, so on each frame, before // color attachment to read only, so on each frame, before
@ -1193,7 +1193,7 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
} }
bool using_srgb_pathway = inv_eotf == WLR_COLOR_TRANSFER_FUNCTION_SRGB && bool using_srgb_pathway = inv_eotf == WLR_COLOR_TRANSFER_FUNCTION_SRGB &&
buffer->srgb.framebuffer != VK_NULL_HANDLE; buffer->srgb.out.framebuffer != VK_NULL_HANDLE;
if (!using_srgb_pathway) { if (!using_srgb_pathway) {
if (options != NULL && options->color_transform != NULL && if (options != NULL && options->color_transform != NULL &&
@ -1205,7 +1205,7 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
} }
} }
if (!buffer->two_pass.image_view) { if (!buffer->two_pass.out.image_view) {
struct wlr_dmabuf_attributes attribs; struct wlr_dmabuf_attributes attribs;
wlr_buffer_get_dmabuf(buffer->wlr_buffer, &attribs); wlr_buffer_get_dmabuf(buffer->wlr_buffer, &attribs);
if (!vulkan_setup_two_pass_framebuffer(buffer, &attribs)) { if (!vulkan_setup_two_pass_framebuffer(buffer, &attribs)) {
@ -1273,10 +1273,10 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
}; };
if (pass->srgb_pathway) { if (pass->srgb_pathway) {
rp_info.renderPass = buffer->srgb.render_setup->render_pass; rp_info.renderPass = buffer->srgb.render_setup->render_pass;
rp_info.framebuffer = buffer->srgb.framebuffer; rp_info.framebuffer = buffer->srgb.out.framebuffer;
} else { } else {
rp_info.renderPass = buffer->two_pass.render_setup->render_pass; rp_info.renderPass = buffer->two_pass.render_setup->render_pass;
rp_info.framebuffer = buffer->two_pass.framebuffer; rp_info.framebuffer = buffer->two_pass.out.framebuffer;
} }
vkCmdBeginRenderPass(cb->vk, &rp_info, VK_SUBPASS_CONTENTS_INLINE); vkCmdBeginRenderPass(cb->vk, &rp_info, VK_SUBPASS_CONTENTS_INLINE);

24
render/vulkan/renderer.c
View file

@ -604,6 +604,12 @@ void vulkan_reset_command_buffer(struct wlr_vk_command_buffer *cb) {
} }
} }
static void finish_render_buffer_out(struct wlr_vk_render_buffer_out *out,
VkDevice dev) {
vkDestroyFramebuffer(dev, out->framebuffer, NULL);
vkDestroyImageView(dev, out->image_view, NULL);
}
static void destroy_render_buffer(struct wlr_vk_render_buffer *buffer) { static void destroy_render_buffer(struct wlr_vk_render_buffer *buffer) {
wl_list_remove(&buffer->link); wl_list_remove(&buffer->link);
wlr_addon_finish(&buffer->addon); wlr_addon_finish(&buffer->addon);
@ -617,11 +623,9 @@ static void destroy_render_buffer(struct wlr_vk_render_buffer *buffer) {
wlr_vk_error("vkQueueWaitIdle", res); wlr_vk_error("vkQueueWaitIdle", res);
} }
vkDestroyFramebuffer(dev, buffer->srgb.framebuffer, NULL); finish_render_buffer_out(&buffer->srgb.out, dev);
vkDestroyImageView(dev, buffer->srgb.image_view, NULL);
vkDestroyFramebuffer(dev, buffer->two_pass.framebuffer, NULL); finish_render_buffer_out(&buffer->two_pass.out, dev);
vkDestroyImageView(dev, buffer->two_pass.image_view, NULL);
vkDestroyImage(dev, buffer->two_pass.blend_image, NULL); vkDestroyImage(dev, buffer->two_pass.blend_image, NULL);
vkFreeMemory(dev, buffer->two_pass.blend_memory, NULL); vkFreeMemory(dev, buffer->two_pass.blend_memory, NULL);
vkDestroyImageView(dev, buffer->two_pass.blend_image_view, NULL); vkDestroyImageView(dev, buffer->two_pass.blend_image_view, NULL);
@ -676,7 +680,7 @@ bool vulkan_setup_two_pass_framebuffer(struct wlr_vk_render_buffer *buffer,
}, },
}; };
res = vkCreateImageView(dev, &view_info, NULL, &buffer->two_pass.image_view); res = vkCreateImageView(dev, &view_info, NULL, &buffer->two_pass.out.image_view);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateImageView failed", res); wlr_vk_error("vkCreateImageView failed", res);
goto error; goto error;
@ -786,7 +790,7 @@ bool vulkan_setup_two_pass_framebuffer(struct wlr_vk_render_buffer *buffer,
VkImageView attachments[] = { VkImageView attachments[] = {
buffer->two_pass.blend_image_view, buffer->two_pass.blend_image_view,
buffer->two_pass.image_view, buffer->two_pass.out.image_view,
}; };
VkFramebufferCreateInfo fb_info = { VkFramebufferCreateInfo fb_info = {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
@ -799,7 +803,7 @@ bool vulkan_setup_two_pass_framebuffer(struct wlr_vk_render_buffer *buffer,
.renderPass = buffer->two_pass.render_setup->render_pass, .renderPass = buffer->two_pass.render_setup->render_pass,
}; };
res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->two_pass.framebuffer); res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->two_pass.out.framebuffer);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateFramebuffer", res); wlr_vk_error("vkCreateFramebuffer", res);
goto error; goto error;
@ -844,7 +848,7 @@ static bool vulkan_setup_one_pass_framebuffer(struct wlr_vk_render_buffer *buffe
}, },
}; };
res = vkCreateImageView(dev, &view_info, NULL, &buffer->srgb.image_view); res = vkCreateImageView(dev, &view_info, NULL, &buffer->srgb.out.image_view);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateImageView failed", res); wlr_vk_error("vkCreateImageView failed", res);
goto error; goto error;
@ -859,7 +863,7 @@ static bool vulkan_setup_one_pass_framebuffer(struct wlr_vk_render_buffer *buffe
VkFramebufferCreateInfo fb_info = { VkFramebufferCreateInfo fb_info = {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO, .sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
.attachmentCount = 1, .attachmentCount = 1,
.pAttachments = &buffer->srgb.image_view, .pAttachments = &buffer->srgb.out.image_view,
.flags = 0u, .flags = 0u,
.width = dmabuf->width, .width = dmabuf->width,
.height = dmabuf->height, .height = dmabuf->height,
@ -867,7 +871,7 @@ static bool vulkan_setup_one_pass_framebuffer(struct wlr_vk_render_buffer *buffe
.renderPass = buffer->srgb.render_setup->render_pass, .renderPass = buffer->srgb.render_setup->render_pass,
}; };
res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->srgb.framebuffer); res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->srgb.out.framebuffer);
if (res != VK_SUCCESS) { if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateFramebuffer", res); wlr_vk_error("vkCreateFramebuffer", res);
goto error; goto error;