mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-03 09:01:40 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

render/vulkan: simplify texture VkPipelineShaderStageCreateInfo

Browse source 
I simplified the quad VkPipelineShaderStageCreateInfo in [1], but
missed the one for texture.

[1]: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3823
This commit is contained in:
Simon Ser 2022-11-07 14:24:39 +01:00
parent cfb768aab9
commit 9a5cc36818
1 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

23
render/vulkan/renderer.c
View file

@ -1318,18 +1318,21 @@ static bool init_tex_pipeline(struct wlr_vk_renderer *renderer,
VkDevice dev = renderer->dev->dev;
// shaders
VkPipelineShaderStageCreateInfo vert_stage = {
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
NULL, 0, VK_SHADER_STAGE_VERTEX_BIT, renderer->vert_module,
"main", NULL
VkPipelineShaderStageCreateInfo tex_stages[2] = {
{
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
.stage = VK_SHADER_STAGE_VERTEX_BIT,
.module = renderer->vert_module,
.pName = "main",
},
{
.sType = VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
.stage = VK_SHADER_STAGE_FRAGMENT_BIT,
.module = renderer->tex_frag_module,
.pName = "main",
},
};
VkPipelineShaderStageCreateInfo tex_stages[2] = {vert_stage, {
VK_STRUCTURE_TYPE_PIPELINE_SHADER_STAGE_CREATE_INFO,
NULL, 0, VK_SHADER_STAGE_FRAGMENT_BIT, renderer->tex_frag_module,
"main", NULL
}};
// info
VkPipelineInputAssemblyStateCreateInfo assembly = {
.sType = VK_STRUCTURE_TYPE_PIPELINE_INPUT_ASSEMBLY_STATE_CREATE_INFO,