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

render/vk: Implement buffer_pass_options.clear_buffer

Browse source
This commit is contained in:
Julia Tatz 2023-12-14 20:35:55 -05:00
parent 4ba290a7a9
commit be23ce9683
3 changed files with 31 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

18
render/vulkan/pass.c
View file

@ -650,7 +650,7 @@ static const struct wlr_render_pass_impl render_pass_impl = {
};
struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *renderer,
struct wlr_vk_render_buffer *buffer) {
struct wlr_vk_render_buffer *buffer, const struct wlr_render_color *clear_color) {
struct wlr_vk_render_pass *pass = calloc(1, sizeof(*pass));
if (pass == NULL) {
return NULL;
@ -662,7 +662,7 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
bool has_blending_buffer = buffer->blend_image != VK_NULL_HANDLE;
struct wlr_vk_render_format_setup *render_setup = find_or_create_render_setup(
renderer, buffer->fmt, has_blending_buffer);
renderer, buffer->fmt, has_blending_buffer, clear_color != NULL);
if (render_setup == NULL) {
free(pass);
return NULL;
@ -697,6 +697,17 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
VkRect2D rect = { .extent = { width, height } };
VkImageView attachments[2] = {0};
uint32_t attachment_count = 0;
VkClearValue clear_values[2] = { 0 };
if (clear_color) {
clear_values[0] = clear_values[1] = (VkClearValue){
.color.float32 = {
color_to_linear(clear_color->r),
color_to_linear(clear_color->g),
color_to_linear(clear_color->b),
clear_color->a,
}
};
}
if (buffer->blend_image_view != VK_NULL_HANDLE) {
attachments[attachment_count++] = buffer->blend_image_view;
@ -714,7 +725,8 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
.renderArea = rect,
.renderPass = render_setup->render_pass,
.framebuffer = framebuffer->vk,
.clearValueCount = 0,
.clearValueCount = clear_color ? attachment_count : 0,
.pClearValues = clear_values,
};
vkCmdBeginRenderPass(cb->vk, &rp_info, VK_SUBPASS_CONTENTS_INLINE);

27
render/vulkan/renderer.c
View file

@ -1287,18 +1287,15 @@ static struct wlr_render_pass *vulkan_begin_buffer_pass(struct wlr_renderer *wlr
}
}
struct wlr_vk_render_pass *render_pass = vulkan_begin_render_pass(renderer, render_buffer);
const struct wlr_render_color *clear_color = NULL;
if (options->clear_buffer) {
clear_color = &options->clear_color;
}
struct wlr_vk_render_pass *render_pass = vulkan_begin_render_pass(renderer, render_buffer, clear_color);
if (render_pass == NULL) {
return NULL;
}
// TODO: switch to using `VkRenderPassBeginInfo.pClearValues`
if (options->clear_buffer) {
wlr_render_pass_add_rect(&render_pass->base, &(struct wlr_render_rect_options){
.box = { .width = buffer->width, .height = buffer->height },
.color = options->clear_color,
.blend_mode = WLR_RENDER_BLEND_MODE_NONE,
});
}
return &render_pass->base;
}
@ -1869,10 +1866,10 @@ static bool init_static_render_data(struct wlr_vk_renderer *renderer) {
struct wlr_vk_render_format_setup *find_or_create_render_setup(
struct wlr_vk_renderer *renderer, const struct wlr_vk_format *format,
bool has_blending_buffer) {
bool has_blending_buffer, bool clear_on_load) {
struct wlr_vk_render_format_setup *setup;
wl_list_for_each(setup, &renderer->render_format_setups, link) {
if (setup->render_format == format && setup->has_blending_buffer == has_blending_buffer) {
if (setup->render_format == format && setup->has_blending_buffer == has_blending_buffer && setup->clear_on_load == clear_on_load) {
return setup;
}
}
@ -1885,19 +1882,21 @@ struct wlr_vk_render_format_setup *find_or_create_render_setup(
setup->render_format = format;
setup->has_blending_buffer = has_blending_buffer;
setup->clear_on_load = clear_on_load;
setup->renderer = renderer;
wl_list_init(&setup->pipelines);
wl_list_init(&setup->framebuffers);
VkDevice dev = renderer->dev->dev;
VkResult res;
VkAttachmentLoadOp load_op = clear_on_load ? VK_ATTACHMENT_LOAD_OP_CLEAR : VK_ATTACHMENT_LOAD_OP_LOAD;
if (has_blending_buffer) {
VkAttachmentDescription attachments[2] = {
{
.format = VK_FORMAT_R16G16B16A16_SFLOAT,
.samples = VK_SAMPLE_COUNT_1_BIT,
.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
.loadOp = load_op,
.storeOp = VK_ATTACHMENT_STORE_OP_STORE,
.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE,
.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE,
@ -1907,7 +1906,7 @@ struct wlr_vk_render_format_setup *find_or_create_render_setup(
{
.format = format->vk,
.samples = VK_SAMPLE_COUNT_1_BIT,
.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
.loadOp = load_op,
.storeOp = VK_ATTACHMENT_STORE_OP_STORE,
.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE,
.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE,
@ -2013,7 +2012,7 @@ struct wlr_vk_render_format_setup *find_or_create_render_setup(
VkAttachmentDescription attachment = {
.format = format->vk_srgb,
.samples = VK_SAMPLE_COUNT_1_BIT,
.loadOp = VK_ATTACHMENT_LOAD_OP_LOAD,
.loadOp = load_op,
.storeOp = VK_ATTACHMENT_STORE_OP_STORE,
.stencilLoadOp = VK_ATTACHMENT_LOAD_OP_DONT_CARE,
.stencilStoreOp = VK_ATTACHMENT_STORE_OP_DONT_CARE,