hal/gles: compressed ETC2 texture support

gfx-rs · Jun 30, 2021 · 037e317 · 037e317
1 parent a6ed424
commit 037e317
Show file tree

Hide file tree

Showing 14 changed files with 210 additions and 128 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,6 +20,9 @@ default-members = ["wgpu", "player", "wgpu-hal", "wgpu-info"]
 [patch."https://github.com/zakarumych/gpu-alloc"]
 #gpu-alloc = { path = "../gpu-alloc/gpu-alloc" }
 
+[patch."https://github.com/grovesNL/glow"]
+glow = { git = "https://github.com/kvark/glow", branch = "bind_vb" }
+
 [patch.crates-io]
 #web-sys = { path = "../wasm-bindgen/crates/web-sys" }
 #js-sys = { path = "../wasm-bindgen/crates/js-sys" }

diff --git a/wgpu-core/src/validation.rs b/wgpu-core/src/validation.rs
@@ -658,7 +658,7 @@ impl NumericType {
             Tf::Bc4RUnorm | Tf::Bc4RSnorm | Tf::EacRUnorm | Tf::EacRSnorm => {
                 (NumericDimension::Scalar, Sk::Float)
             }
-            Tf::Bc5RgUnorm | Tf::Bc5RgSnorm | Tf::EtcRgUnorm | Tf::EtcRgSnorm => {
+            Tf::Bc5RgUnorm | Tf::Bc5RgSnorm | Tf::EacRgUnorm | Tf::EacRgSnorm => {
                 (NumericDimension::Vector(Vs::Bi), Sk::Float)
             }
             Tf::Bc6hRgbUfloat | Tf::Bc6hRgbSfloat | Tf::Etc2RgbUnorm | Tf::Etc2RgbUnormSrgb => {

diff --git a/wgpu-hal/Cargo.toml b/wgpu-hal/Cargo.toml
@@ -12,7 +12,7 @@ license = "MIT OR Apache-2.0"
 [lib]
 
 [features]
-default = []
+default = ["gles"]
 metal = ["naga/msl-out", "block", "foreign-types"]
 vulkan = ["naga/spv-out", "ash", "gpu-alloc", "gpu-descriptor", "libloading", "inplace_it", "renderdoc-sys"]
 gles = ["naga/glsl-out", "glow", "egl", "libloading"]

diff --git a/wgpu-hal/src/gles/adapter.rs b/wgpu-hal/src/gles/adapter.rs
@@ -177,7 +177,7 @@ impl super::Adapter {
             naga::back::glsl::Version::Embedded(value)
         };
 
-        let mut features = wgt::Features::empty();
+        let mut features = wgt::Features::empty() | wgt::Features::TEXTURE_COMPRESSION_ETC2;
         features.set(
             wgt::Features::DEPTH_CLAMPING,
             extensions.contains("GL_EXT_depth_clamp"),
@@ -394,8 +394,8 @@ impl crate::Adapter<super::Api> for super::Adapter {
             | Tf::Etc2RgbA1UnormSrgb
             | Tf::EacRUnorm
             | Tf::EacRSnorm
-            | Tf::EtcRgUnorm
-            | Tf::EtcRgSnorm
+            | Tf::EacRgUnorm
+            | Tf::EacRgSnorm
             | Tf::Astc4x4RgbaUnorm
             | Tf::Astc4x4RgbaUnormSrgb
             | Tf::Astc5x4RgbaUnorm

diff --git a/wgpu-hal/src/gles/command.rs b/wgpu-hal/src/gles/command.rs
@@ -294,24 +294,14 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
     ) where
         T: Iterator<Item = crate::BufferTextureCopy>,
     {
-        let format_info = dst.format.describe();
-        assert_eq!(
-            format_info.block_dimensions,
-            (1, 1),
-            "Compressed texture copies are TODO"
-        );
         let (dst_raw, dst_target) = dst.inner.as_native();
         for copy in regions {
             self.cmd_buffer.commands.push(C::CopyBufferToTexture {
                 src: src.raw,
                 src_target: src.target,
                 dst: dst_raw,
                 dst_target,
-                dst_info: super::TextureCopyInfo {
-                    external_format: dst.format_desc.external,
-                    data_type: dst.format_desc.data_type,
-                    texel_size: format_info.block_size,
-                },
+                dst_format: dst.format,
                 copy,
             })
         }
@@ -326,22 +316,12 @@ impl crate::CommandEncoder<super::Api> for super::CommandEncoder {
     ) where
         T: Iterator<Item = crate::BufferTextureCopy>,
     {
-        let format_info = src.format.describe();
-        assert_eq!(
-            format_info.block_dimensions,
-            (1, 1),
-            "Compressed texture copies are TODO"
-        );
         let (src_raw, src_target) = src.inner.as_native();
         for copy in regions {
             self.cmd_buffer.commands.push(C::CopyTextureToBuffer {
                 src: src_raw,
                 src_target,
-                src_info: super::TextureCopyInfo {
-                    external_format: src.format_desc.external,
-                    data_type: src.format_desc.data_type,
-                    texel_size: format_info.block_size,
-                },
+                src_format: src.format,
                 dst: dst.raw,
                 dst_target: dst.target,
                 copy,

diff --git a/wgpu-hal/src/gles/conv.rs b/wgpu-hal/src/gles/conv.rs
@@ -73,16 +73,24 @@ impl super::AdapterShared {
             | Tf::Bc6hRgbSfloat
             | Tf::Bc6hRgbUfloat
             | Tf::Bc7RgbaUnorm
-            | Tf::Bc7RgbaUnormSrgb
-            | Tf::Etc2RgbUnorm
-            | Tf::Etc2RgbUnormSrgb
-            | Tf::Etc2RgbA1Unorm
-            | Tf::Etc2RgbA1UnormSrgb
-            | Tf::EacRUnorm
-            | Tf::EacRSnorm
-            | Tf::EtcRgUnorm
-            | Tf::EtcRgSnorm
-            | Tf::Astc4x4RgbaUnorm
+            | Tf::Bc7RgbaUnormSrgb => unimplemented!(),
+            Tf::Etc2RgbUnorm => (glow::COMPRESSED_RGB8_ETC2, glow::RGB, 0),
+            Tf::Etc2RgbUnormSrgb => (glow::COMPRESSED_SRGB8_ETC2, glow::RGB, 0),
+            Tf::Etc2RgbA1Unorm => (
+                glow::COMPRESSED_RGB8_PUNCHTHROUGH_ALPHA1_ETC2,
+                glow::RGBA,
+                0,
+            ),
+            Tf::Etc2RgbA1UnormSrgb => (
+                glow::COMPRESSED_SRGB8_PUNCHTHROUGH_ALPHA1_ETC2,
+                glow::RGBA,
+                0,
+            ),
+            Tf::EacRUnorm => (glow::COMPRESSED_R11_EAC, glow::RED, 0),
+            Tf::EacRSnorm => (glow::COMPRESSED_SIGNED_R11_EAC, glow::RED, 0),
+            Tf::EacRgUnorm => (glow::COMPRESSED_RG11_EAC, glow::RG, 0),
+            Tf::EacRgSnorm => (glow::COMPRESSED_SIGNED_RG11_EAC, glow::RG, 0),
+            Tf::Astc4x4RgbaUnorm
             | Tf::Astc4x4RgbaUnormSrgb
             | Tf::Astc5x4RgbaUnorm
             | Tf::Astc5x4RgbaUnormSrgb

diff --git a/wgpu-hal/src/gles/mod.rs b/wgpu-hal/src/gles/mod.rs
@@ -418,13 +418,6 @@ impl Fence {
     }
 }
 
-#[derive(Debug)]
-struct TextureCopyInfo {
-    external_format: u32,
-    data_type: u32,
-    texel_size: u8,
-}
-
 #[derive(Clone, Debug, PartialEq)]
 struct StencilOps {
     pass: u32,
@@ -535,13 +528,13 @@ enum Command {
         src_target: BindTarget,
         dst: glow::Texture,
         dst_target: BindTarget,
-        dst_info: TextureCopyInfo,
+        dst_format: wgt::TextureFormat,
         copy: crate::BufferTextureCopy,
     },
     CopyTextureToBuffer {
         src: glow::Texture,
         src_target: BindTarget,
-        src_info: TextureCopyInfo,
+        src_format: wgt::TextureFormat,
         dst: glow::Buffer,
         dst_target: BindTarget,
         copy: crate::BufferTextureCopy,