Update for gfx-rs/wgpu#2477

jinleili · Feb 15, 2022 · f215500 · f215500
1 parent ba00bcc
commit f215500
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -20,7 +20,7 @@ noise = {version = "0.7", default-features = false}
 pollster = "0.2"
 rand = {version = "0.7.2"}
 # wgpu = {git = "https://github.com/gfx-rs/wgpu", rev = "6931e571"}
-wgpu = {git = "https://github.com/jinleili/wgpu", rev = "33c168c"}
+wgpu = {git = "https://github.com/jinleili/wgpu", rev = "92d7b257"}
 # wgpu = {path = "../../forks/wgpu/wgpu"}
 
 [target.'cfg(any(not(target_os = "ios"), not(target_os = "android")))'.dependencies]

diff --git a/app-surface/Cargo.toml b/app-surface/Cargo.toml
@@ -14,7 +14,7 @@ default = []
 log = "0.4"
 pollster = "0.2"
 # wgpu = {git = "https://github.com/gfx-rs/wgpu", rev = "6931e571"}
-wgpu = {git = "https://github.com/jinleili/wgpu", rev = "33c168c"}
+wgpu = {git = "https://github.com/jinleili/wgpu", rev = "92d7b257"}
 # wgpu = {path = "../../../forks/wgpu/wgpu"}
 
 [target.'cfg(any(not(target_os = "ios"), not(target_os = "android")))'.dependencies]

diff --git a/src/examples/hdr_image_view.rs b/src/examples/hdr_image_view.rs
@@ -3,6 +3,7 @@ use app_surface::{AppSurface, Frame};
 use std::borrow::Cow;
 use wgpu::util::DeviceExt;
 use wgpu::PrimitiveTopology;
+use wgpu::{AstcBlock, AstcChannel, TextureFormat};
 
 #[allow(dead_code)]
 pub struct HDRImageView {
@@ -32,7 +33,10 @@ impl HDRImageView {
                 mip_level_count: 1,
                 sample_count: 1,
                 dimension: wgpu::TextureDimension::D2,
-                format: wgpu::TextureFormat::Astc6x6RgbaHdr,
+                format: TextureFormat::Astc {
+                    block: AstcBlock::B6x6,
+                    channel: AstcChannel::Hdr,
+                },
                 usage: wgpu::TextureUsages::TEXTURE_BINDING | wgpu::TextureUsages::COPY_DST,
                 label: None,
             },

diff --git a/src/wgpu_canvas.rs b/src/wgpu_canvas.rs
@@ -49,7 +49,6 @@ impl WgpuCanvas {
         } else if index == 4 {
             Box::new(Shadow::new(app_surface))
         } else {
-            println!("dafd");
             Box::new(HDRImageView::new(app_surface))
         }
     }