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

Merge branch 'vk' into 'master'

Browse source 
render/vulkan: remove redundant renderer pointer from render pass

See merge request wlroots/wlroots!5286
This commit is contained in:
YaoBing Xiao 2026-04-13 04:36:00 +08:00
commit 44ea489a18
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/render/vulkan.h
View file

@ -430,7 +430,6 @@ struct wlr_vk_render_pass_texture {
struct wlr_vk_render_pass {
struct wlr_render_pass base;
struct wlr_vk_renderer *renderer;
struct wlr_vk_render_buffer *render_buffer;
struct wlr_vk_render_buffer_out *render_buffer_out;
struct wlr_vk_render_format_setup *render_setup;

7
render/vulkan/pass.c
View file

@ -115,7 +115,7 @@ static bool render_pass_wait_render_buffer(struct wlr_vk_render_pass *pass,
continue;
}
VkSemaphore sem = vulkan_command_buffer_wait_sync_file(pass->renderer,
VkSemaphore sem = vulkan_command_buffer_wait_sync_file(pass->render_buffer->renderer,
pass->command_buffer, *render_wait_len_ptr, sync_file_fds[i]);
if (sem == VK_NULL_HANDLE) {
close(sync_file_fds[i]);
@ -176,7 +176,7 @@ static bool unwrap_color_transform(struct wlr_color_transform *transform,
static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
struct wlr_vk_render_pass *pass = get_render_pass(wlr_pass);
struct wlr_vk_renderer *renderer = pass->renderer;
struct wlr_vk_renderer *renderer = pass->render_buffer->renderer;
struct wlr_vk_command_buffer *render_cb = pass->command_buffer;
struct wlr_vk_render_buffer *render_buffer = pass->render_buffer;
struct wlr_vk_command_buffer *stage_cb = NULL;
@ -746,7 +746,7 @@ static void render_pass_add_rect(struct wlr_render_pass *wlr_pass,
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_renderer *renderer = pass->render_buffer->renderer;
VkCommandBuffer cb = pass->command_buffer->vk;
struct wlr_vk_texture *texture = vulkan_get_texture(options->texture);
@ -1248,7 +1248,6 @@ struct wlr_vk_render_pass *vulkan_begin_render_pass(struct wlr_vk_renderer *rend
}
wlr_render_pass_init(&pass->base, &render_pass_impl);
pass->renderer = renderer;
pass->two_pass = using_two_pass_pathway;
if (options != NULL && options->color_transform != NULL) {
pass->color_transform = wlr_color_transform_ref(options->color_transform);