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

render/vulkan: Rename wlr_vk_color_transform.lut_3d to lut

Browse source 
We will want to use the same members for 3x1d transforms
This commit is contained in:
Alexander Orzechowski 2024-08-24 23:25:25 -04:00
parent d4b4a3e57e
commit 04563f88e1
2 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/render/vulkan.h
View file

@ -497,7 +497,7 @@ struct wlr_vk_color_transform {
VkDeviceMemory memory; VkDeviceMemory memory;
VkDescriptorSet ds; VkDescriptorSet ds;
struct wlr_vk_descriptor_pool *ds_pool; struct wlr_vk_descriptor_pool *ds_pool;
} lut_3d; } lut;
}; };
void vk_color_transform_destroy(struct wlr_addon *addon); void vk_color_transform_destroy(struct wlr_addon *addon);

22
render/vulkan/pass.c
View file

@ -132,7 +132,7 @@ static bool render_pass_submit(struct wlr_render_pass *wlr_pass) {
pl = render_buffer->plain.render_setup->output_pipe_lut3d; pl = render_buffer->plain.render_setup->output_pipe_lut3d;
struct wlr_vk_color_transform *transform = struct wlr_vk_color_transform *transform =
get_color_transform(pass->color_transform, renderer); 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 = struct wlr_color_transform_lut3d *lut =
wlr_color_transform_lut3d_from_base(pass->color_transform); 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); struct wlr_vk_color_transform *transform = wl_container_of(addon, transform, addon);
VkDevice dev = renderer->dev->dev; VkDevice dev = renderer->dev->dev;
if (transform->lut_3d.image) { if (transform->lut.image) {
vkDestroyImage(dev, transform->lut_3d.image, NULL); vkDestroyImage(dev, transform->lut.image, NULL);
vkDestroyImageView(dev, transform->lut_3d.image_view, NULL); vkDestroyImageView(dev, transform->lut.image_view, NULL);
vkFreeMemory(dev, transform->lut_3d.memory, NULL); vkFreeMemory(dev, transform->lut.memory, NULL);
vulkan_free_ds(renderer, transform->lut_3d.ds_pool, transform->lut_3d.ds); vulkan_free_ds(renderer, transform->lut.ds_pool, transform->lut.ds);
} }
wl_list_remove(&transform->link); 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 (transform->type == COLOR_TRANSFORM_LUT_3D) {
if (!create_3d_lut_image(renderer, if (!create_3d_lut_image(renderer,
wlr_color_transform_lut3d_from_base(transform), wlr_color_transform_lut3d_from_base(transform),
&vk_transform->lut_3d.image, &vk_transform->lut.image,
&vk_transform->lut_3d.image_view, &vk_transform->lut.image_view,
&vk_transform->lut_3d.memory, &vk_transform->lut.memory,
&vk_transform->lut_3d.ds, &vk_transform->lut.ds,
&vk_transform->lut_3d.ds_pool)) { &vk_transform->lut.ds_pool)) {
free(vk_transform); free(vk_transform);
return NULL; return NULL;
} }