mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-29 05:40: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

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) {
wl_list_remove(&buffer->link);
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);
}
vkDestroyFramebuffer(dev, buffer->srgb.framebuffer, NULL);
vkDestroyImageView(dev, buffer->srgb.image_view, NULL);
finish_render_buffer_out(&buffer->srgb.out, dev);
vkDestroyFramebuffer(dev, buffer->two_pass.framebuffer, NULL);
vkDestroyImageView(dev, buffer->two_pass.image_view, NULL);
finish_render_buffer_out(&buffer->two_pass.out, dev);
vkDestroyImage(dev, buffer->two_pass.blend_image, NULL);
vkFreeMemory(dev, buffer->two_pass.blend_memory, 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) {
wlr_vk_error("vkCreateImageView failed", res);
goto error;
@ -786,7 +790,7 @@ bool vulkan_setup_two_pass_framebuffer(struct wlr_vk_render_buffer *buffer,
VkImageView attachments[] = {
buffer->two_pass.blend_image_view,
buffer->two_pass.image_view,
buffer->two_pass.out.image_view,
};
VkFramebufferCreateInfo fb_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,
};
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) {
wlr_vk_error("vkCreateFramebuffer", res);
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) {
wlr_vk_error("vkCreateImageView failed", res);
goto error;
@ -859,7 +863,7 @@ static bool vulkan_setup_one_pass_framebuffer(struct wlr_vk_render_buffer *buffe
VkFramebufferCreateInfo fb_info = {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
.attachmentCount = 1,
.pAttachments = &buffer->srgb.image_view,
.pAttachments = &buffer->srgb.out.image_view,
.flags = 0u,
.width = dmabuf->width,
.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,
};
res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->srgb.framebuffer);
res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->srgb.out.framebuffer);
if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateFramebuffer", res);
goto error;