Remove channel_count_from_format function

asny · May 7, 2021 · 9e2aa10 · 9e2aa10
1 parent 6ad90a0
commit 9e2aa10
Showing 1 changed file with 7 additions and 11 deletions.
diff --git a/src/core/texture.rs b/src/core/texture.rs
@@ -341,7 +341,13 @@ impl<T: TextureValueType> ColorTargetTexture2D<T> {
             })?;
         }
 
-        let channels = channel_count_from_format(self.format);
+        let channels = match self.format {
+            Format::R => 1,
+            Format::RGB => 3,
+            Format::SRGB => 3,
+            Format::RGBA => 4,
+            Format::SRGBA => 4,
+        };
         let mut pixels = vec![T::default(); viewport.width * viewport.height * channels];
         let render_target = RenderTarget::new_color(&self.context, &self)?;
         render_target.bind(consts::DRAW_FRAMEBUFFER)?;
@@ -1024,16 +1030,6 @@ fn internal_format_from_depth(format: DepthFormat) -> u32 {
     }
 }
 
-fn channel_count_from_format(format: Format) -> usize {
-    match format {
-        Format::R => 1,
-        Format::RGB => 3,
-        Format::SRGB => 3,
-        Format::RGBA => 4,
-        Format::SRGBA => 4,
-    }
-}
-
 fn format_from(format: Format) -> u32 {
     match format {
         Format::R => consts::RED,