Cleanup depth texture struct

Author: rishflab

src/renderer.rs

@@ -3,7 +3,7 @@ use crate::{
     gpu_primitives::{CameraUniform, InstanceRaw, Vertex},
     scene::Scene,
     sprite::{DrawSprite, Sprite},
-    texture::Texture,
+    texture::DepthTexture,
 };
 use std::{mem, num::NonZeroU32};
 use wgpu::{util::DeviceExt, BlendFactor, BlendOperation};
@@ -14,7 +14,7 @@ pub struct Renderer {
     sprites: Vec<Sprite>,
     uniform_buffer: wgpu::Buffer,
     pipeline: wgpu::RenderPipeline,
-    depth_texture: Texture,
+    depth_texture: DepthTexture,
     uniform_bind_group: wgpu::BindGroup,
 }
 
@@ -104,7 +104,7 @@ impl Renderer {
         let fs_module =
             device.create_shader_module(&wgpu::include_spirv!("../shaders/shader.frag.spv"));
 
-        let depth_texture = Texture::create_depth_texture(&device, &sc_desc);
+        let depth_texture = DepthTexture::new(&device, &sc_desc);
 
         let pipeline = device.create_render_pipeline(&wgpu::RenderPipelineDescriptor {
             label: None,
@@ -137,7 +137,7 @@ impl Renderer {
                 ..Default::default()
             },
             depth_stencil: Some(wgpu::DepthStencilState {
-                format: Texture::DEPTH_FORMAT,
+                format: DepthTexture::DEPTH_FORMAT,
                 depth_write_enabled: true,
                 depth_compare: wgpu::CompareFunction::Less,
                 stencil: wgpu::StencilState::default(),

src/texture.rs

@@ -1,77 +1,15 @@
 use image::RgbaImage;
 
-pub struct Texture {
+pub struct DepthTexture {
     pub texture: wgpu::Texture,
     pub view: wgpu::TextureView,
     pub sampler: wgpu::Sampler,
 }
 
-impl Texture {
+impl DepthTexture {
     pub const DEPTH_FORMAT: wgpu::TextureFormat = wgpu::TextureFormat::Depth32Float;
 
-    pub fn _create_sprite_texture(
-        device: &wgpu::Device,
-        queue: &wgpu::Queue,
-        image: RgbaImage,
-    ) -> Self {
-        let texels = image.to_vec();
-        let texture_extent = wgpu::Extent3d {
-            width: image.width(),
-            height: image.height(),
-            depth: 1,
-        };
-        let desc = &wgpu::TextureDescriptor {
-            label: None,
-            size: texture_extent,
-            mip_level_count: 1,
-            sample_count: 1,
-            dimension: wgpu::TextureDimension::D2,
-            format: wgpu::TextureFormat::Rgba8UnormSrgb,
-            usage: wgpu::TextureUsage::SAMPLED | wgpu::TextureUsage::COPY_DST,
-        };
-
-        let texture = device.create_texture(&desc);
-
-        let view = texture.create_view(&wgpu::TextureViewDescriptor::default());
-
-        queue.write_texture(
-            wgpu::TextureCopyView {
-                texture: &texture,
-                mip_level: 0,
-                origin: wgpu::Origin3d::ZERO,
-            },
-            &texels,
-            wgpu::TextureDataLayout {
-                offset: 0,
-                bytes_per_row: 4 * image.width(),
-                rows_per_image: 0,
-            },
-            texture_extent,
-        );
-
-        // Create other resources
-        let sampler = device.create_sampler(&wgpu::SamplerDescriptor {
-            label: None,
-            address_mode_u: wgpu::AddressMode::ClampToEdge,
-            address_mode_v: wgpu::AddressMode::ClampToEdge,
-            address_mode_w: wgpu::AddressMode::ClampToEdge,
-            mag_filter: wgpu::FilterMode::Nearest,
-            min_filter: wgpu::FilterMode::Linear,
-            mipmap_filter: wgpu::FilterMode::Nearest,
-            ..Default::default()
-        });
-
-        Self {
-            texture,
-            view,
-            sampler,
-        }
-    }
-
-    pub fn create_depth_texture(
-        device: &wgpu::Device,
-        sc_desc: &wgpu::SwapChainDescriptor,
-    ) -> Self {
+    pub fn new(device: &wgpu::Device, sc_desc: &wgpu::SwapChainDescriptor) -> Self {
         let size = wgpu::Extent3d {
             width: sc_desc.width,
             height: sc_desc.height,