From ce2273518017a6333b12b190a4cb318ddc5b42dd Mon Sep 17 00:00:00 2001
From: mars <mars@tebibyte.media>
Date: Sun, 8 May 2022 15:52:48 -0600
Subject: [PATCH] Refactor into storage module

---
 src/lib.rs                     | 3 +--
 src/pass/debug.rs              | 2 +-
 src/pass/mesh.rs               | 4 ++--
 src/{ => storage}/mesh.rs      | 0
 src/{gpu.rs => storage/mod.rs} | 2 ++
 5 files changed, 6 insertions(+), 5 deletions(-)
 rename src/{ => storage}/mesh.rs (100%)
 rename src/{gpu.rs => storage/mod.rs} (99%)

diff --git a/src/lib.rs b/src/lib.rs
index 027b3d9..8fe1c85 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -6,12 +6,11 @@ use std::sync::Arc;
 use std::sync::Mutex;
 
 pub mod camera;
-pub mod gpu;
-pub mod mesh;
 pub mod pass;
 pub mod phase;
 pub mod shader;
 pub mod staging;
+pub mod storage;
 pub mod viewport;
 
 use camera::Camera;
diff --git a/src/pass/debug.rs b/src/pass/debug.rs
index 6df069b..8e2ad07 100644
--- a/src/pass/debug.rs
+++ b/src/pass/debug.rs
@@ -1,5 +1,5 @@
 use super::*;
-use crate::gpu::GpuVec;
+use crate::storage::GpuVec;
 use crate::viewport::ViewportInfo;
 use crate::RenderLayouts;
 
diff --git a/src/pass/mesh.rs b/src/pass/mesh.rs
index ddb0618..062d1bd 100644
--- a/src/pass/mesh.rs
+++ b/src/pass/mesh.rs
@@ -1,6 +1,6 @@
 use super::*;
-use crate::gpu::GpuVec;
-use crate::mesh::*;
+use crate::storage::GpuVec;
+use crate::storage::mesh::*;
 use crate::shader::{ShaderHandle, ShaderStore};
 use crate::viewport::ViewportInfo;
 use crate::RenderLayouts;
diff --git a/src/mesh.rs b/src/storage/mesh.rs
similarity index 100%
rename from src/mesh.rs
rename to src/storage/mesh.rs
diff --git a/src/gpu.rs b/src/storage/mod.rs
similarity index 99%
rename from src/gpu.rs
rename to src/storage/mod.rs
index 460d53d..6c43b05 100644
--- a/src/gpu.rs
+++ b/src/storage/mod.rs
@@ -1,3 +1,5 @@
+pub mod mesh;
+
 use bytemuck::Pod;
 use std::ops::{Deref, DerefMut};
 use std::sync::Arc;