Add set layouts to shader ci

Author: karnkaul

guide/src/shader_objects/drawing_triangle.md

@@ -22,6 +22,8 @@ void App::create_shader() {
     .device = *m_device,
     .vertex_spirv = vertex_spirv,
     .fragment_spirv = fragment_spirv,
+    .vertex_input = {},
+    .set_layouts = {},
   };
   m_shader.emplace(shader_ci);
 }

guide/src/shader_objects/shader_program.md

@@ -46,6 +46,7 @@ struct ShaderProgramCreateInfo {
   vk::Device device;
   std::span<std::uint32_t const> vertex_spirv;
   std::span<std::uint32_t const> fragment_spirv;
+  std::span<vk::DescriptorSetLayout const> set_layouts;
 };
 ```
 
@@ -69,12 +70,13 @@ The definition of the constructor is fairly straightforward:
 
 ```cpp
 ShaderProgram::ShaderProgram(CreateInfo const& create_info) {
-  static auto const create_shader_ci =
-    [](std::span<std::uint32_t const> spirv) {
+  auto const create_shader_ci =
+    [&create_info](std::span<std::uint32_t const> spirv) {
       auto ret = vk::ShaderCreateInfoEXT{};
       ret.setCodeSize(spirv.size_bytes())
         .setPCode(spirv.data())
         // set common parameters.
+        .setSetLayouts(create_info.set_layouts)
         .setCodeType(vk::ShaderCodeTypeEXT::eSpirv)
         .setPName("main");
       return ret;

src/app.cpp

@@ -219,6 +219,8 @@ void App::create_shader() {
 		.device = *m_device,
 		.vertex_spirv = vertex_spirv,
 		.fragment_spirv = fragment_spirv,
+		.vertex_input = {},
+		.set_layouts = {},
 	};
 	m_shader.emplace(shader_ci);
 }

src/shader_program.cpp

@@ -10,12 +10,13 @@ constexpr auto to_vkbool(bool const value) {
 
 ShaderProgram::ShaderProgram(CreateInfo const& create_info)
 	: m_vertex_input(create_info.vertex_input) {
-	static auto const create_shader_ci =
-		[](std::span<std::uint32_t const> spirv) {
+	auto const create_shader_ci =
+		[&create_info](std::span<std::uint32_t const> spirv) {
 			auto ret = vk::ShaderCreateInfoEXT{};
 			ret.setCodeSize(spirv.size_bytes())
 				.setPCode(spirv.data())
 				// set common parameters.
+				.setSetLayouts(create_info.set_layouts)
 				.setCodeType(vk::ShaderCodeTypeEXT::eSpirv)
 				.setPName("main");
 			return ret;

src/shader_program.hpp

@@ -14,7 +14,8 @@ struct ShaderProgramCreateInfo {
 	vk::Device device;
 	std::span<std::uint32_t const> vertex_spirv;
 	std::span<std::uint32_t const> fragment_spirv;
-	ShaderVertexInput vertex_input{};
+	ShaderVertexInput vertex_input;
+	std::span<vk::DescriptorSetLayout const> set_layouts;
 };
 
 class ShaderProgram {