From f215500a41a488539c358fe13d17b99eed9eb847 Mon Sep 17 00:00:00 2001
From: Jinlei Li <grenlight@icloud.com>
Date: Tue, 15 Feb 2022 18:39:51 +0800
Subject: [PATCH] Update for https://github.com/gfx-rs/wgpu/pull/2477

---
 Cargo.lock                     | 8 ++++----
 Cargo.toml                     | 2 +-
 app-surface/Cargo.toml         | 2 +-
 src/examples/hdr_image_view.rs | 6 +++++-
 src/wgpu_canvas.rs             | 1 -
 5 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 545f9ac..e84d06b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1565,7 +1565,7 @@ dependencies = [
 [[package]]
 name = "wgpu"
 version = "0.12.0"
-source = "git+https://github.com/jinleili/wgpu?rev=33c168c#33c168c752b78ae4f83fecae05d484b75e932ec1"
+source = "git+https://github.com/jinleili/wgpu?rev=92d7b257#92d7b257f1a8653455e7fafb04e8ae4adb39858c"
 dependencies = [
  "arrayvec",
  "js-sys",
@@ -1585,7 +1585,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.12.0"
-source = "git+https://github.com/jinleili/wgpu?rev=33c168c#33c168c752b78ae4f83fecae05d484b75e932ec1"
+source = "git+https://github.com/jinleili/wgpu?rev=92d7b257#92d7b257f1a8653455e7fafb04e8ae4adb39858c"
 dependencies = [
  "arrayvec",
  "bitflags",
@@ -1607,7 +1607,7 @@ dependencies = [
 [[package]]
 name = "wgpu-hal"
 version = "0.12.0"
-source = "git+https://github.com/jinleili/wgpu?rev=33c168c#33c168c752b78ae4f83fecae05d484b75e932ec1"
+source = "git+https://github.com/jinleili/wgpu?rev=92d7b257#92d7b257f1a8653455e7fafb04e8ae4adb39858c"
 dependencies = [
  "arrayvec",
  "ash",
@@ -1665,7 +1665,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.12.0"
-source = "git+https://github.com/jinleili/wgpu?rev=33c168c#33c168c752b78ae4f83fecae05d484b75e932ec1"
+source = "git+https://github.com/jinleili/wgpu?rev=92d7b257#92d7b257f1a8653455e7fafb04e8ae4adb39858c"
 dependencies = [
  "bitflags",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 545644e..47afce3 100644
--- 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
index 248d891..ce4ff4d 100644
--- 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
index 9b84b48..7b7eeaf 100644
--- 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
index f312ad9..6e92b71 100644
--- 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))
         }
     }