[update] winit and fix render semaphores not being attached to queue submissions.

Author: vmarcella

crates/lambda-platform/Cargo.toml

@@ -9,7 +9,7 @@ path = "src/lib.rs"
 
 [dependencies]
 gfx-hal = "=0.9.0"
-winit = "=0.26.1"
+winit = "=0.27.4"
 shaderc = "=0.7"
 cfg-if = "=1.0.0"
 

crates/lambda-platform/src/gfx/api.rs

@@ -2,15 +2,15 @@
 //! implementations to use.
 
 cfg_if::cfg_if! {
-  if #[cfg(feature = "with-gl")] {
+  if #[cfg(feature = "gfx-with-gl")] {
     pub use gfx_backend_gl as RenderingAPI;
-  } else if #[cfg(feature = "with-vulkan")] {
+  } else if #[cfg(feature = "gfx-with-vulkan")] {
     pub use gfx_backend_vulkan as RenderingAPI;
-  } else if #[cfg(feature = "with-metal")] {
+  } else if #[cfg(feature = "gfx-with-metal")] {
     pub use gfx_backend_metal as RenderingAPI;
-  } else if #[cfg(feature = "with-dx11")] {
+  } else if #[cfg(feature = "gfx-with-dx11")] {
     pub use gfx_backend_dx11 as RenderingAPI;
-  } else if #[cfg(feature = "with-dx12")] {
+  } else if #[cfg(feature = "gfx-with-dx12")] {
     pub use gfx_backend_dx12 as RenderingAPI;
   } else if #[cfg(feature = "detect-platform")] {
       pub use gfx_platform_backend as RenderingAPI;

crates/lambda-platform/src/gfx/command.rs

@@ -94,7 +94,7 @@ pub enum Command<RenderBackend: gfx_hal::Backend> {
     pipeline: Rc<RenderPipeline<RenderBackend>>,
     stage: super::pipeline::PipelineStage,
     offset: u32,
-    bytes: &'static [u32],
+    bytes: Vec<u32>,
   },
   EndRecording,
 }
@@ -182,7 +182,7 @@ impl<'command_pool, RenderBackend: gfx_hal::Backend>
           super::pipeline::internal::pipeline_layout_for(pipeline.as_ref()),
           stage,
           offset,
-          bytes,
+          bytes.as_slice(),
         ),
         Command::Draw { vertices } => self.command_buffer.draw(vertices, 0..1),
         Command::EndRecording => self.command_buffer.finish(),

crates/lambda-platform/src/gfx/fence.rs

@@ -133,4 +133,10 @@ pub mod internal {
   ) -> &mut RenderBackend::Semaphore {
     return &mut semaphore.semaphore;
   }
+
+  pub fn semaphore_for<RenderBackend: gfx_hal::Backend>(
+    semaphore: &super::RenderSemaphore<RenderBackend>,
+  ) -> &RenderBackend::Semaphore {
+    return &semaphore.semaphore;
+  }
 }

crates/lambda-platform/src/gfx/gpu.rs

@@ -129,7 +129,7 @@ impl<RenderBackend: gfx_hal::Backend> Gpu<RenderBackend> {
   pub fn submit_command_buffer<'render_context>(
     &mut self,
     command_buffer: &mut CommandBuffer<RenderBackend>,
-    signal_semaphores: Vec<RenderSemaphore<RenderBackend>>,
+    signal_semaphores: Vec<&RenderSemaphore<RenderBackend>>,
     fence: &mut RenderSubmissionFence<RenderBackend>,
   ) {
     let commands =
@@ -139,7 +139,11 @@ impl<RenderBackend: gfx_hal::Backend> Gpu<RenderBackend> {
       self.queue_group.queues[0].submit(
         commands,
         vec![].into_iter(),
-        vec![].into_iter(),
+        // TODO(vmarcella): This was needed to allow the push constants to
+        // properly render to the screen. Look into a better way to do this.
+        signal_semaphores.into_iter().map(|semaphore| {
+          return super::fence::internal::semaphore_for(semaphore);
+        }),
         Some(super::fence::internal::mutable_fence_for(fence)),
       );
     }
@@ -154,6 +158,7 @@ impl<RenderBackend: gfx_hal::Backend> Gpu<RenderBackend> {
     let (render_surface, render_image) =
       super::surface::internal::borrow_surface_and_take_image(surface);
 
+    println!("Rendering to surface.");
     let result = unsafe {
       self.queue_group.queues[0].present(
         render_surface,
@@ -169,6 +174,8 @@ impl<RenderBackend: gfx_hal::Backend> Gpu<RenderBackend> {
       );
     }
 
+    println!("Rendered to surface.");
+
     return Ok(());
   }
 }

crates/lambda-platform/src/gfx/pipeline.rs

@@ -89,13 +89,13 @@ impl<RenderBackend: internal::Backend> RenderPipelineBuilder<RenderBackend> {
   ) -> RenderPipeline<RenderBackend> {
     // TODO(vmarcella): The pipeline layout should be configurable through the
     // RenderPipelineBuilder.
+    let push_constants = self.push_constants.into_iter();
+
     let pipeline_layout = unsafe {
       use internal::Device;
+
       super::internal::logical_device_for(gpu)
-        .create_pipeline_layout(
-          vec![].into_iter(),
-          self.push_constants.into_iter(),
-        )
+        .create_pipeline_layout(vec![].into_iter(), push_constants)
         .expect(
           "The GPU does not have enough memory to allocate a pipeline layout",
         )

crates/lambda-platform/src/gfx/shader.rs

@@ -29,7 +29,7 @@ impl ShaderModuleBuilder {
   pub fn new() -> Self {
     return Self {
       entry_name: "main".to_string(),
-      specializations: ShaderSpecializations::default(),
+      specializations: ShaderSpecializations::EMPTY,
     };
   }
 

crates/lambda-platform/src/shaderc/mod.rs

@@ -15,10 +15,13 @@ impl ShaderCompilerBuilder {
   pub fn build(self) -> ShaderCompiler {
     let compiler =
       shaderc::Compiler::new().expect("Failed to create shaderc compiler.");
+
+    let mut options = shaderc::CompileOptions::new()
+      .expect("Failed to create shaderc compile options.");
+
     return ShaderCompiler {
       compiler,
-      default_options: shaderc::CompileOptions::new()
-        .expect("Failed to set the default shaderc compiler options"),
+      default_options: options,
     };
   }
 }
@@ -84,8 +87,6 @@ impl ShaderCompiler {
     entry_point: &str,
     shader_kind: ShaderKind,
   ) -> Vec<u32> {
-    // TODO(vmarcella): Investigate into common strategies for reading from files
-    // efficiently in Rust.
     let mut opened_shader_file = std::fs::File::open(path).unwrap();
     let mut shader_source = String::new();
     opened_shader_file
@@ -94,7 +95,13 @@ impl ShaderCompiler {
 
     let compiled_shader = self
       .compiler
-      .compile_into_spirv(&shader_source, shader_kind, path, entry_point, None)
+      .compile_into_spirv(
+        &shader_source,
+        shader_kind,
+        path,
+        entry_point,
+        Some(&self.default_options),
+      )
       .expect("Failed to compile the shader.");
     return compiled_shader.as_binary().to_vec();
   }
@@ -109,8 +116,15 @@ impl ShaderCompiler {
   ) -> Vec<u32> {
     let compiled_shader = self
       .compiler
-      .compile_into_spirv(shader_source, shader_kind, name, entry_point, None)
+      .compile_into_spirv(
+        shader_source,
+        shader_kind,
+        name,
+        entry_point,
+        Some(&self.default_options),
+      )
       .expect("Failed to compile the shader.");
+
     return compiled_shader.as_binary().to_vec();
   }
 }