From 4e48017de993f0b9a4754230eb93649801e7bd79 Mon Sep 17 00:00:00 2001 From: Pierre Krieger Date: Wed, 17 Feb 2016 17:10:55 +0100 Subject: [PATCH] Fix empty input and output --- vulkano-shaders/src/lib.rs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/vulkano-shaders/src/lib.rs b/vulkano-shaders/src/lib.rs index 0fd26c980..35dfb83cf 100644 --- a/vulkano-shaders/src/lib.rs +++ b/vulkano-shaders/src/lib.rs @@ -135,8 +135,13 @@ fn write_entry_point(doc: &parse::Spirv, instruction: &parse::Instruction) -> St } } + let input = { + let input = input_types.join(", "); + if input.is_empty() { input } else { input + "," } + }; + let t = format!("::vulkano::shader::VertexShaderEntryPoint<({input})>", - input = input_types.join(", ") + ","); + input = input); (t, "vertex_shader_entry_point") }, @@ -169,8 +174,13 @@ fn write_entry_point(doc: &parse::Spirv, instruction: &parse::Instruction) -> St } } + let output = { + let output = output_types.join(", "); + if output.is_empty() { output } else { output + "," } + }; + let t = format!("::vulkano::shader::FragmentShaderEntryPoint<({output})>", - output = output_types.join(", ") + ","); + output = output); (t, "fragment_shader_entry_point") },