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

render/vulkan: add wlr_vk_render_pass.render_buffer_out

Browse source 
Simplifies the logic and prepares for a new render setup.
This commit is contained in:
Simon Ser 2025-06-21 18:06:28 +02:00
parent 35eba5f2fe
commit b2d09cdee9
2 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/render/vulkan.h
View file

@ -398,6 +398,7 @@ struct wlr_vk_render_pass {
struct wlr_render_pass base; struct wlr_render_pass base;
struct wlr_vk_renderer *renderer; struct wlr_vk_renderer *renderer;
struct wlr_vk_render_buffer *render_buffer; struct wlr_vk_render_buffer *render_buffer;
struct wlr_vk_render_buffer_out *render_buffer_out;
struct wlr_vk_render_format_setup *render_setup; struct wlr_vk_render_format_setup *render_setup;
struct wlr_vk_command_buffer *command_buffer; struct wlr_vk_command_buffer *command_buffer;
struct rect_union updated_region; struct rect_union updated_region;

25
render/vulkan/pass.c
View file

@ -398,16 +398,12 @@ 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->render_buffer_out->transitioned) {
if (!render_buffer->srgb.out.transitioned) { src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED;
src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED; pass->render_buffer_out->transitioned = true;
render_buffer->srgb.out.transitioned = true; }
}
} else { if (!pass->srgb_pathway) {
if (!render_buffer->two_pass.out.transitioned) {
src_layout = VK_IMAGE_LAYOUT_PREINITIALIZED;
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
// the render pass starts, we change it back // the render pass starts, we change it back
@ -1211,6 +1207,8 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
struct wlr_vk_render_format_setup *render_setup = struct wlr_vk_render_format_setup *render_setup =
using_srgb_pathway ? buffer->srgb.render_setup : buffer->two_pass.render_setup; using_srgb_pathway ? buffer->srgb.render_setup : buffer->two_pass.render_setup;
struct wlr_vk_render_buffer_out *buffer_out =
using_srgb_pathway ? &buffer->srgb.out : &buffer->two_pass.out;
struct wlr_vk_render_pass *pass = calloc(1, sizeof(*pass)); struct wlr_vk_render_pass *pass = calloc(1, sizeof(*pass));
if (pass == NULL) { if (pass == NULL) {
@ -1268,12 +1266,8 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
.renderArea = rect, .renderArea = rect,
.clearValueCount = 0, .clearValueCount = 0,
.renderPass = render_setup->render_pass, .renderPass = render_setup->render_pass,
.framebuffer = buffer_out->framebuffer,
}; };
if (pass->srgb_pathway) {
rp_info.framebuffer = buffer->srgb.out.framebuffer;
} else {
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);
vkCmdSetViewport(cb->vk, 0, 1, &(VkViewport){ vkCmdSetViewport(cb->vk, 0, 1, &(VkViewport){
@ -1288,6 +1282,7 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
wlr_buffer_lock(buffer->wlr_buffer); wlr_buffer_lock(buffer->wlr_buffer);
pass->render_buffer = buffer; pass->render_buffer = buffer;
pass->render_buffer_out = buffer_out;
pass->render_setup = render_setup; pass->render_setup = render_setup;
pass->command_buffer = cb; pass->command_buffer = cb;
return pass; return pass;