[update] logging for all crates.

Author: vmarcella

Cargo.lock

@@ -1,7 +1,7 @@
 [package]
 name = "lambda-rs-logging"
 description = "Logging support for lambda-rs"
-version = "2023.1.29"
+version = "2023.1.30"
 edition = "2021"
 license = "MIT"
 

crates/lambda-rs-logging/Cargo.toml

@@ -44,12 +44,12 @@ impl FileHandler {
     let log_message = format!("[{}]-[{:?}]: {}", timestamp, log_level, message);
 
     let colored_message = match log_level {
-      LogLevel::TRACE => format!("\x1B[34m{}\x1B[0m\n", log_message),
-      LogLevel::DEBUG => format!("\x1B[33m{}\x1B[0m\n", log_message),
-      LogLevel::INFO => format!("\x1B[32m{}\x1B[0m\n", log_message),
-      LogLevel::WARN => format!("\x1B[31m{}\x1B[0m\n", log_message),
-      LogLevel::ERROR => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
-      LogLevel::FATAL => format!("\x1B[31;1m{}\x1B[0m\n", log_message),
+      LogLevel::TRACE => format!("\x1B[37m{}\x1B[0m", log_message),
+      LogLevel::DEBUG => format!("\x1B[35m{}\x1B[0m", log_message),
+      LogLevel::INFO => format!("\x1B[32m{}\x1B[0m", log_message),
+      LogLevel::WARN => format!("\x1B[33m{}\x1B[0m", log_message),
+      LogLevel::ERROR => format!("\x1B[31;1m{}\x1B[0m", log_message),
+      LogLevel::FATAL => format!("\x1B[31;1m{}\x1B[0m", log_message),
     };
 
     self.log_buffer.push(colored_message);

crates/lambda-rs-logging/src/handler.rs

@@ -19,6 +19,8 @@ rand = "=0.8.5"
 obj-rs = "=0.7.0"
 gfx-backend-empty = "=0.9.0"
 
+lambda-rs-logging = { path = "../lambda-rs-logging", version = "2023.1.30" }
+
 # GFX-RS backends
 gfx-backend-gl = { version="=0.9.0", optional = true }
 gfx-backend-metal = { version="=0.9.0", optional = true }

crates/lambda-rs-platform/Cargo.toml

@@ -47,8 +47,8 @@ impl PrimitiveAssemblerBuilder {
 
     match (buffers, attributes) {
       (Some(buffers), Some(attributes)) => {
-        println!(
-          "[DEBUG] Building primitive assembler with buffers and attributes"
+        logging::debug!(
+          "Building primitive assembler with buffers and attributes"
         );
         self.buffer_descriptions = buffers
           .iter()

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

@@ -110,7 +110,10 @@ impl BufferBuilder {
 
     // TODO(vmarcella): Add the ability for the user to specify the memory
     // properties (I.E. SparseFlags::SPARSE_MEMORY).
-    println!("[DEBUG] Creating buffer of length: {}", self.buffer_length);
+    logging::debug!(
+      "[DEBUG] Creating buffer of length: {}",
+      self.buffer_length
+    );
     let buffer_result = unsafe {
       logical_device.create_buffer(
         self.buffer_length as u64,
@@ -120,6 +123,7 @@ impl BufferBuilder {
     };
 
     if buffer_result.is_err() {
+      logging::error!("Failed to create buffer for allocating memory.");
       return Err("Failed to create buffer for allocating memory.");
     }
 
@@ -129,7 +133,7 @@ impl BufferBuilder {
       unsafe { logical_device.get_buffer_requirements(&buffer) };
     let memory_types = physical_device.memory_properties().memory_types;
 
-    println!("[DEBUG] Buffer requirements: {:?}", requirements);
+    logging::debug!("Buffer requirements: {:?}", requirements);
     // Find a memory type that supports the requirements of the buffer.
     let memory_type = memory_types
       .iter()
@@ -141,12 +145,13 @@ impl BufferBuilder {
       .map(|(id, _)| MemoryTypeId(id))
       .unwrap();
 
-    println!("Allocating memory for buffer.");
+    logging::debug!("Allocating memory for buffer.");
     // Allocates the memory on the GPU for the buffer.
     let buffer_memory_allocation =
       unsafe { logical_device.allocate_memory(memory_type, requirements.size) };
 
     if buffer_memory_allocation.is_err() {
+      logging::error!("Failed to allocate memory for buffer.");
       return Err("Failed to allocate memory for buffer.");
     }
 
@@ -160,6 +165,7 @@ impl BufferBuilder {
     // Destroy the buffer if we failed to bind it to memory.
     if buffer_binding.is_err() {
       unsafe { logical_device.destroy_buffer(buffer) };
+      logging::error!("Failed to bind buffer memory.");
       return Err("Failed to bind buffer memory.");
     }
 
@@ -169,6 +175,7 @@ impl BufferBuilder {
 
     if get_mapping_to_memory.is_err() {
       unsafe { logical_device.destroy_buffer(buffer) };
+      logging::error!("Failed to map memory.");
       return Err("Failed to map memory.");
     }
     let mapped_memory = get_mapping_to_memory.unwrap();
@@ -194,6 +201,7 @@ impl BufferBuilder {
 
     if memory_flush.is_err() {
       unsafe { logical_device.destroy_buffer(buffer) };
+      logging::error!("Failed to flush memory.");
       return Err("No memory available on the GPU.");
     }
 

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

@@ -163,7 +163,7 @@ impl<RenderBackend: gfx_hal::Backend> Gpu<RenderBackend> {
     };
 
     if result.is_err() {
-      println!(
+      logging::error!(
         "Failed to present to the surface: {:?}",
         result.err().unwrap()
       );

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

@@ -167,7 +167,7 @@ pub struct RenderPipeline<RenderBackend: Backend> {
 impl<RenderBackend: Backend> RenderPipeline<RenderBackend> {
   /// Destroys the pipeline layout and graphical pipeline
   pub fn destroy(self, gpu: &super::gpu::Gpu<RenderBackend>) {
-    println!("Destroying render pipeline");
+    logging::debug!("Destroying render pipeline");
     unsafe {
       for buffer in self.buffers {
         buffer.destroy(gpu);

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

@@ -128,7 +128,7 @@ impl<RenderBackend: gfx_hal::Backend> Surface<RenderBackend> {
   /// Remove the swapchain configuration that this surface used on this given
   /// GPU.
   pub fn remove_swapchain(&mut self, gpu: &Gpu<RenderBackend>) {
-    println!("Removing the swapchain configuration from: {}", self.name);
+    logging::debug!("Removing the swapchain configuration from: {}", self.name);
     unsafe {
       self
         .gfx_hal_surface
@@ -138,7 +138,7 @@ impl<RenderBackend: gfx_hal::Backend> Surface<RenderBackend> {
 
   /// Destroy the current surface and it's underlying resources.
   pub fn destroy(self, instance: &Instance<RenderBackend>) {
-    println!("Destroying the surface: {}", self.name);
+    logging::debug!("Destroying the surface: {}", self.name);
 
     instance.destroy_surface(self.gfx_hal_surface);
   }

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

@@ -1,6 +1,7 @@
 use lambda::{
   component::Component,
   events::WindowEvent,
+  logging,
   math::{
     matrix,
     matrix::Matrix,
@@ -186,7 +187,7 @@ impl Component<ComponentResult, String> for PushConstantsExample {
       ])
       .build();
 
-    println!("mesh: {:?}", mesh);
+    logging::trace!("mesh: {:?}", mesh);
 
     let pipeline = RenderPipelineBuilder::new()
       .with_push_constant(PipelineStage::VERTEX, push_constant_size)
@@ -208,7 +209,7 @@ impl Component<ComponentResult, String> for PushConstantsExample {
     &mut self,
     render_context: &mut lambda::render::RenderContext,
   ) -> Result<ComponentResult, String> {
-    println!("Detaching component");
+    logging::info!("Detaching component");
     return Ok(ComponentResult::Success);
   }
 
@@ -222,7 +223,7 @@ impl Component<ComponentResult, String> for PushConstantsExample {
         WindowEvent::Resize { width, height } => {
           self.width = width;
           self.height = height;
-          println!("Window resized to {}x{}", width, height);
+          logging::info!("Window resized to {}x{}", width, height);
         }
         _ => {}
       },