hyprwm/wlroots-hyprland
1
0
Fork 0
mirror of https://github.com/hyprwm/wlroots-hyprland.git synced 2024-11-22 21:05:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

render/vulkan: de-dup pipeline layout initialization

Browse source
This commit is contained in:
Simon Ser 2023-05-22 20:03:05 +02:00
parent 16dea12dae
commit 7099fa2ea4
1 changed files with 5 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
render/vulkan/renderer.c
View file

@ -2405,10 +2405,9 @@ static bool init_blend_to_output_pipeline(struct wlr_vk_renderer *renderer,
return true; return true;
} }
static bool init_default_pipeline_layout(struct wlr_vk_renderer *renderer) { static bool init_pipeline_layout(struct wlr_vk_renderer *renderer,
struct wlr_vk_pipeline_layout *pipeline_layout = &renderer->default_pipeline_layout; struct wlr_vk_pipeline_layout *pipeline_layout) {
if (!init_sampler(renderer, &pipeline_layout->sampler, pipeline_layout->ycbcr.conversion)) {
if (!init_sampler(renderer, &pipeline_layout->sampler, VK_NULL_HANDLE)) {
return false; return false;
} }
@ -2443,15 +2442,7 @@ static bool init_ycbcr_pipeline_layout(struct wlr_vk_renderer *renderer,
return false; return false;
} }
if (!init_sampler(renderer, &pipeline_layout->sampler, pipeline_layout->ycbcr.conversion)) { return init_pipeline_layout(renderer, pipeline_layout);
return false;
}
if (!init_tex_layouts(renderer, pipeline_layout->sampler, &pipeline_layout->ds, &pipeline_layout->vk)) {
return false;
}
return true;
} }
// Creates static render data, such as sampler, layouts and shader modules // Creates static render data, such as sampler, layouts and shader modules
@ -2461,7 +2452,7 @@ static bool init_static_render_data(struct wlr_vk_renderer *renderer) {
VkResult res; VkResult res;
VkDevice dev = renderer->dev->dev; VkDevice dev = renderer->dev->dev;
if (!init_default_pipeline_layout(renderer)) { if (!init_pipeline_layout(renderer, &renderer->default_pipeline_layout)) {
return false; return false;
} }