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

Merge branch 'buffer-pass-clear' into 'master'

Browse source 
render: optionally clear buffer before rendering

See merge request wlroots/wlroots!4518
This commit is contained in:
Julia Tatz 2024-04-22 06:05:12 +00:00
commit 229f89b416
19 changed files with 254 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

56
render/vulkan/pass.c
View file

@ -105,7 +105,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
};
mat3_to_mat4(final_matrix, vert_pcr_data.mat4);
bind_pipeline(pass, render_buffer->render_setup->output_pipe);
bind_pipeline(pass, pass->render_setup->output_pipe);
vkCmdPushConstants(render_cb->vk, renderer->output_pipe_layout,
VK_SHADER_STAGE_VERTEX_BIT, 0, sizeof(vert_pcr_data), &vert_pcr_data);
vkCmdBindDescriptorSets(render_cb->vk,
@ -484,7 +484,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
wlr_matrix_multiply(matrix, pass->projection, matrix);
struct wlr_vk_pipeline *pipe = setup_get_or_create_pipeline(
pass->render_buffer->render_setup,
pass->render_setup,
&(struct wlr_vk_pipeline_key) {
.source = WLR_VK_SHADER_SOURCE_SINGLE_COLOR,
.layout = { .ycbcr_format = NULL },
@ -548,7 +548,6 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
const struct wlr_render_texture_options *options) {
struct wlr_vk_render_pass *pass = get_render_pass(wlr_pass);
struct wlr_vk_renderer *renderer = pass->renderer;
struct wlr_vk_render_buffer *render_buffer = pass->render_buffer;
VkCommandBuffer cb = pass->command_buffer->vk;
struct wlr_vk_texture *texture = vulkan_get_texture(options->texture);
@ -594,7 +593,7 @@ static void render_pass_add_texture(struct wlr_render_pass *wlr_pass,
mat3_to_mat4(matrix, vert_pcr_data.mat4);
struct wlr_vk_pipeline *pipe = setup_get_or_create_pipeline(
render_buffer->render_setup,
pass->render_setup,
&(struct wlr_vk_pipeline_key) {
.source = WLR_VK_SHADER_SOURCE_TEXTURE,
.layout = {
@ -659,7 +658,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;
@ -669,6 +668,21 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
rect_union_init(&pass->updated_region);
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, clear_color != NULL);
if (render_setup == NULL) {
free(pass);
return NULL;
}
struct wlr_vk_framebuffer *framebuffer = get_or_create_framebuffer(
render_setup, buffer->wlr_buffer->width, buffer->wlr_buffer->height);
if (framebuffer == NULL) {
free(pass);
return NULL;
}
struct wlr_vk_command_buffer *cb = vulkan_acquire_command_buffer(renderer);
if (cb == NULL) {
free(pass);
@ -689,13 +703,38 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
int width = buffer->wlr_buffer->width;
int height = buffer->wlr_buffer->height;
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;
}
attachments[attachment_count++] = buffer->image_view;
VkRenderPassAttachmentBeginInfo attachment_info = {
.sType = VK_STRUCTURE_TYPE_RENDER_PASS_ATTACHMENT_BEGIN_INFO,
.attachmentCount = attachment_count,
.pAttachments = attachments,
};
VkRenderPassBeginInfo rp_info = {
.sType = VK_STRUCTURE_TYPE_RENDER_PASS_BEGIN_INFO,
.pNext = &attachment_info,
.renderArea = rect,
.renderPass = buffer->render_setup->render_pass,
.framebuffer = buffer->framebuffer,
.clearValueCount = 0,
.renderPass = render_setup->render_pass,
.framebuffer = framebuffer->vk,
.clearValueCount = clear_color ? attachment_count : 0,
.pClearValues = clear_values,
};
vkCmdBeginRenderPass(cb->vk, &rp_info, VK_SUBPASS_CONTENTS_INLINE);
@ -711,6 +750,7 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
wlr_buffer_lock(buffer->wlr_buffer);
pass->render_buffer = buffer;
pass->render_setup = render_setup;
pass->command_buffer = cb;
return pass;
}

154
render/vulkan/renderer.c
View file

@ -54,10 +54,6 @@ struct wlr_vk_renderer *vulkan_get_renderer(struct wlr_renderer *wlr_renderer) {
return renderer;
}
static 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);
static struct wlr_vk_descriptor_pool *alloc_ds(
struct wlr_vk_renderer *renderer, VkDescriptorSet *ds,
VkDescriptorType type, const VkDescriptorSetLayout *layout,
@ -163,6 +159,12 @@ static void destroy_render_format_setup(struct wlr_vk_renderer *renderer,
vkDestroyPipeline(dev, pipeline->vk, NULL);
free(pipeline);
}
struct wlr_vk_framebuffer *framebuffer, *tmp_framebuffer;
wl_list_for_each_safe(framebuffer, tmp_framebuffer, &setup->framebuffers, link) {
vkDestroyFramebuffer(dev, framebuffer->vk, NULL);
free(framebuffer);
}
}
static void shared_buffer_destroy(struct wlr_vk_renderer *r,
@ -570,7 +572,6 @@ static void destroy_render_buffer(struct wlr_vk_render_buffer *buffer) {
wlr_vk_error("vkQueueWaitIdle", res);
}
vkDestroyFramebuffer(dev, buffer->framebuffer, NULL);
vkDestroyImageView(dev, buffer->image_view, NULL);
vkDestroyImage(dev, buffer->image, NULL);
@ -743,6 +744,7 @@ static struct wlr_vk_render_buffer *create_render_buffer(
dmabuf.format, (const char*) &dmabuf.format);
goto error;
}
buffer->fmt = &fmt->format;
VkImageViewCreateInfo view_info = {
.sType = VK_STRUCTURE_TYPE_IMAGE_VIEW_CREATE_INFO,
@ -770,41 +772,10 @@ static struct wlr_vk_render_buffer *create_render_buffer(
bool has_blending_buffer = !using_mutable_srgb;
buffer->render_setup = find_or_create_render_setup(
renderer, &fmt->format, has_blending_buffer);
if (!buffer->render_setup) {
if (has_blending_buffer && !setup_blend_image(renderer, buffer, dmabuf.width, dmabuf.height)) {
goto error;
}
VkImageView attachments[2] = {0};
uint32_t attachment_count = 0;
if (has_blending_buffer) {
if (!setup_blend_image(renderer, buffer, dmabuf.width, dmabuf.height)) {
goto error;
}
attachments[attachment_count++] = buffer->blend_image_view;
}
attachments[attachment_count++] = buffer->image_view;
VkFramebufferCreateInfo fb_info = {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
.attachmentCount = attachment_count,
.pAttachments = attachments,
.flags = 0u,
.width = dmabuf.width,
.height = dmabuf.height,
.layers = 1u,
.renderPass = buffer->render_setup->render_pass,
};
res = vkCreateFramebuffer(dev, &fb_info, NULL, &buffer->framebuffer);
if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateFramebuffer", res);
goto error;
}
wlr_addon_init(&buffer->addon, &wlr_buffer->addons, renderer,
&render_buffer_addon_impl);
wl_list_insert(&renderer->render_buffers, &buffer->link);
@ -820,7 +791,6 @@ error:
vkFreeMemory(dev, buffer->blend_memory, NULL);
vkDestroyImageView(dev, buffer->blend_image_view, NULL);
vkDestroyFramebuffer(dev, buffer->framebuffer, NULL);
vkDestroyImageView(dev, buffer->image_view, NULL);
vkDestroyImage(dev, buffer->image, NULL);
for (size_t i = 0u; i < buffer->mem_count; ++i) {
@ -1315,7 +1285,12 @@ 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;
}
@ -1886,12 +1861,12 @@ static bool init_static_render_data(struct wlr_vk_renderer *renderer) {
return true;
}
static struct wlr_vk_render_format_setup *find_or_create_render_setup(
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) {
if (setup->render_format == format && setup->has_blending_buffer == has_blending_buffer && setup->clear_on_load == clear_on_load) {
return setup;
}
}
@ -1903,18 +1878,22 @@ static 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,
@ -1924,7 +1903,7 @@ static 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,
@ -2030,7 +2009,7 @@ static 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,
@ -2142,6 +2121,91 @@ error:
return NULL;
}
struct wlr_vk_framebuffer *get_or_create_framebuffer(
struct wlr_vk_render_format_setup *setup,
int width, int height) {
struct wlr_vk_framebuffer *framebuffer;
wl_list_for_each(framebuffer, &setup->framebuffers, link) {
if (framebuffer->width == width && framebuffer->height == height) {
return framebuffer;
}
}
framebuffer = calloc(1u, sizeof(*framebuffer));
if (!framebuffer) {
wlr_log(WLR_ERROR, "Allocation failed");
return NULL;
}
bool using_mutable_srgb = !setup->has_blending_buffer;
VkResult res;
VkDevice dev = setup->renderer->dev->dev;
VkFramebufferAttachmentImageInfo attachments[2] = {0};
uint32_t attachment_count = 0;
VkFormat view_formats[] = {
setup->render_format->vk,
setup->render_format->vk_srgb,
};
VkFormat blend_view_formats[] = {
VK_FORMAT_R16G16B16A16_SFLOAT,
};
if (setup->has_blending_buffer) {
attachments[attachment_count++] = (VkFramebufferAttachmentImageInfo) {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO,
.flags = 0,
.usage = VK_IMAGE_USAGE_COLOR_ATTACHMENT_BIT | VK_IMAGE_USAGE_INPUT_ATTACHMENT_BIT,
.width = width,
.height = height,
.layerCount = 1,
.viewFormatCount = 1,
.pViewFormats = blend_view_formats,
};
}
attachments[attachment_count++] = (VkFramebufferAttachmentImageInfo) {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENT_IMAGE_INFO,
.flags = using_mutable_srgb ? VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT : 0,
.usage = vulkan_render_usage,
.width = width,
.height = height,
.layerCount = 1,
.viewFormatCount = using_mutable_srgb ? 2 : 1,
.pViewFormats = view_formats,
};
VkFramebufferAttachmentsCreateInfo fb_attachments_info = {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_ATTACHMENTS_CREATE_INFO,
.attachmentImageInfoCount = attachment_count,
.pAttachmentImageInfos = attachments,
};
VkFramebufferCreateInfo fb_info = {
.sType = VK_STRUCTURE_TYPE_FRAMEBUFFER_CREATE_INFO,
.pNext = &fb_attachments_info,
.attachmentCount = attachment_count,
.pAttachments = NULL,
.flags = VK_FRAMEBUFFER_CREATE_IMAGELESS_BIT,
.width = width,
.height = height,
.layers = 1u,
.renderPass = setup->render_pass,
};
res = vkCreateFramebuffer(dev, &fb_info, NULL, &framebuffer->vk);
if (res != VK_SUCCESS) {
wlr_vk_error("vkCreateFramebuffer", res);
goto error;
}
wl_list_insert(&setup->framebuffers, &framebuffer->link);
return framebuffer;
error:
free(framebuffer);
return NULL;
}
struct wlr_renderer *vulkan_renderer_create_for_device(struct wlr_vk_device *dev) {
struct wlr_vk_renderer *renderer;
VkResult res;

6
render/vulkan/vulkan.c
View file

@ -464,6 +464,7 @@ struct wlr_vk_device *vulkan_device_create(struct wlr_vk_instance *ini,
extensions[extensions_len++] = VK_KHR_EXTERNAL_MEMORY_FD_EXTENSION_NAME;
extensions[extensions_len++] = VK_KHR_EXTERNAL_SEMAPHORE_FD_EXTENSION_NAME;
extensions[extensions_len++] = VK_KHR_IMAGE_FORMAT_LIST_EXTENSION_NAME; // or vulkan 1.2
extensions[extensions_len++] = VK_KHR_IMAGELESS_FRAMEBUFFER_EXTENSION_NAME; // or vulkan 1.2
extensions[extensions_len++] = VK_EXT_EXTERNAL_MEMORY_DMA_BUF_EXTENSION_NAME;
extensions[extensions_len++] = VK_EXT_QUEUE_FAMILY_FOREIGN_EXTENSION_NAME;
extensions[extensions_len++] = VK_EXT_IMAGE_DRM_FORMAT_MODIFIER_EXTENSION_NAME;
@ -569,8 +570,13 @@ struct wlr_vk_device *vulkan_device_create(struct wlr_vk_instance *ini,
"falling back to regular queue priority");
}
VkPhysicalDeviceImagelessFramebufferFeatures imageless_framebuffer_features = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_IMAGELESS_FRAMEBUFFER_FEATURES,
.imagelessFramebuffer = VK_TRUE,
};
VkPhysicalDeviceSamplerYcbcrConversionFeatures sampler_ycbcr_features = {
.sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_SAMPLER_YCBCR_CONVERSION_FEATURES,
.pNext = &imageless_framebuffer_features,
.samplerYcbcrConversion = dev->sampler_ycbcr_conversion,
};
VkPhysicalDeviceSynchronization2FeaturesKHR sync2_features = {