From dd930da20253c65f00143899fbbf844cd37f4241 Mon Sep 17 00:00:00 2001
From: Joshua Simmons <josh@nega.tv>
Date: Thu, 17 Nov 2022 00:33:21 +0100
Subject: [PATCH] Add Default impls for subresource structs

---
 narcissus-gpu/src/lib.rs | 23 +++++++++++++++++++++++
 narcissus/src/main.rs    | 24 ++++--------------------
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/narcissus-gpu/src/lib.rs b/narcissus-gpu/src/lib.rs
index 37473c3..781483d 100644
--- a/narcissus-gpu/src/lib.rs
+++ b/narcissus-gpu/src/lib.rs
@@ -120,6 +120,17 @@ pub struct ImageSubresourceLayers {
     pub array_layer_count: u32,
 }
 
+impl Default for ImageSubresourceLayers {
+    fn default() -> Self {
+        Self {
+            aspect: ImageAspectFlags::COLOR,
+            mip_level: 0,
+            base_array_layer: 0,
+            array_layer_count: 1,
+        }
+    }
+}
+
 pub struct ImageSubresourceRange {
     pub aspect: ImageAspectFlags,
     pub base_mip_level: u32,
@@ -128,6 +139,18 @@ pub struct ImageSubresourceRange {
     pub array_layer_count: u32,
 }
 
+impl Default for ImageSubresourceRange {
+    fn default() -> Self {
+        Self {
+            aspect: ImageAspectFlags::COLOR,
+            base_mip_level: 0,
+            mip_level_count: 1,
+            base_array_layer: 0,
+            array_layer_count: 1,
+        }
+    }
+}
+
 flags_def!(BufferUsageFlags);
 impl BufferUsageFlags {
     pub const UNIFORM: Self = Self(1 << 0);
diff --git a/narcissus/src/main.rs b/narcissus/src/main.rs
index 7010930..277d13c 100644
--- a/narcissus/src/main.rs
+++ b/narcissus/src/main.rs
@@ -157,6 +157,7 @@ fn create_image_with_data(
     let frame = device.begin_frame();
 
     let buffer = create_buffer_with_data(device, BufferUsageFlags::TRANSFER_SRC, data);
+
     let image = device.create_image(&ImageDesc {
         memory_location: MemoryLocation::PreferDevice,
         usage: ImageUsageFlags::SAMPLED | ImageUsageFlags::TRANSFER_DST,
@@ -181,13 +182,7 @@ fn create_image_with_data(
             prev_layout: ImageLayout::Optimal,
             next_layout: ImageLayout::Optimal,
             image,
-            subresource_range: ImageSubresourceRange {
-                aspect: ImageAspectFlags::COLOR,
-                base_mip_level: 0,
-                mip_level_count: 1,
-                base_array_layer: 0,
-                array_layer_count: 1,
-            },
+            subresource_range: default(),
         }],
     );
 
@@ -200,12 +195,7 @@ fn create_image_with_data(
             buffer_offset: 0,
             buffer_row_length: 0,
             buffer_image_height: 0,
-            image_subresource_layers: ImageSubresourceLayers {
-                aspect: ImageAspectFlags::COLOR,
-                mip_level: 0,
-                base_array_layer: 0,
-                array_layer_count: 1,
-            },
+            image_subresource_layers: default(),
             image_offset: Offset3d { x: 0, y: 0, z: 0 },
             image_extent: Extent3d {
                 width,
@@ -224,13 +214,7 @@ fn create_image_with_data(
             prev_layout: ImageLayout::Optimal,
             next_layout: ImageLayout::Optimal,
             image,
-            subresource_range: ImageSubresourceRange {
-                aspect: ImageAspectFlags::COLOR,
-                base_mip_level: 0,
-                mip_level_count: 1,
-                base_array_layer: 0,
-                array_layer_count: 1,
-            },
+            subresource_range: default(),
         }],
     );
 
-- 
2.49.0