From 04563f88e1f5eab525a69ccb499035d7dc07f7ee Mon Sep 17 00:00:00 2001 From: Alexander Orzechowski Date: Sat, 24 Aug 2024 23:25:25 -0400 Subject: [PATCH] render/vulkan: Rename wlr_vk_color_transform.lut_3d to lut We will want to use the same members for 3x1d transforms --- include/render/vulkan.h | 2 +- render/vulkan/pass.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/render/vulkan.h b/include/render/vulkan.h index faf9d0b59..8b7368660 100644 --- a/include/render/vulkan.h +++ b/include/render/vulkan.h @@ -497,7 +497,7 @@ struct wlr_vk_color_transform { VkDeviceMemory memory; VkDescriptorSet ds; struct wlr_vk_descriptor_pool *ds_pool; - } lut_3d; + } lut; }; void vk_color_transform_destroy(struct wlr_addon *addon); diff --git a/render/vulkan/pass.c b/render/vulkan/pass.c index ec8782b26..e9f7280e0 100644 --- a/render/vulkan/pass.c +++ b/render/vulkan/pass.c @@ -132,7 +132,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) { pl = render_buffer->plain.render_setup->output_pipe_lut3d; struct wlr_vk_color_transform *transform = get_color_transform(pass->color_transform, renderer); - ds[ds_len++] = transform->lut_3d.ds; + ds[ds_len++] = transform->lut.ds; struct wlr_color_transform_lut3d *lut = wlr_color_transform_lut3d_from_base(pass->color_transform); @@ -712,11 +712,11 @@ void vk_color_transform_destroy(struct wlr_addon *addon) { struct wlr_vk_color_transform *transform = wl_container_of(addon, transform, addon); VkDevice dev = renderer->dev->dev; - if (transform->lut_3d.image) { - vkDestroyImage(dev, transform->lut_3d.image, NULL); - vkDestroyImageView(dev, transform->lut_3d.image_view, NULL); - vkFreeMemory(dev, transform->lut_3d.memory, NULL); - vulkan_free_ds(renderer, transform->lut_3d.ds_pool, transform->lut_3d.ds); + if (transform->lut.image) { + vkDestroyImage(dev, transform->lut.image, NULL); + vkDestroyImageView(dev, transform->lut.image_view, NULL); + vkFreeMemory(dev, transform->lut.memory, NULL); + vulkan_free_ds(renderer, transform->lut.ds_pool, transform->lut.ds); } wl_list_remove(&transform->link); @@ -900,11 +900,11 @@ static struct wlr_vk_color_transform *vk_color_transform_create( if (transform->type == COLOR_TRANSFORM_LUT_3D) { if (!create_3d_lut_image(renderer, wlr_color_transform_lut3d_from_base(transform), - &vk_transform->lut_3d.image, - &vk_transform->lut_3d.image_view, - &vk_transform->lut_3d.memory, - &vk_transform->lut_3d.ds, - &vk_transform->lut_3d.ds_pool)) { + &vk_transform->lut.image, + &vk_transform->lut.image_view, + &vk_transform->lut.memory, + &vk_transform->lut.ds, + &vk_transform->lut.ds_pool)) { free(vk_transform); return NULL; }