From 1a7b210b70af7156c62c1933970e25c60799634e Mon Sep 17 00:00:00 2001
From: Jeremy Soller <jackpot51@gmail.com>
Date: Sat, 3 Feb 2024 12:12:56 -0700
Subject: [PATCH] Use patched wgpu

---
 Cargo.lock | 33 ++++++++++++++-------------------
 Cargo.toml |  2 ++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 689f548..2abb29c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1095,7 +1095,7 @@ dependencies = [
 [[package]]
 name = "cosmic-text"
 version = "0.10.0"
-source = "git+https://github.com/pop-os/cosmic-text#cc75bb66b40794702ebc9fc9e30b1b29d7438bb5"
+source = "git+https://github.com/pop-os/cosmic-text#be471833c9ee563866f07593354a41dd40761a18"
 dependencies = [
  "bitflags 2.4.2",
  "cosmic_undo_2",
@@ -2611,9 +2611,9 @@ dependencies = [
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.59"
+version = "0.1.60"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6a67363e2aa4443928ce15e57ebae94fd8949958fd1223c4cfc0cd473ad7539"
+checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys 0.8.6",
@@ -3519,9 +3519,8 @@ checksum = "16cf681a23b4d0a43fc35024c176437f9dcd818db34e0f42ab456a0ee5ad497b"
 
 [[package]]
 name = "naga"
-version = "0.14.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae585df4b6514cf8842ac0f1ab4992edc975892704835b549cf818dc0191249e"
+version = "0.14.1"
+source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
 dependencies = [
  "bit-set",
  "bitflags 2.4.2",
@@ -5453,9 +5452,9 @@ dependencies = [
 
 [[package]]
 name = "time"
-version = "0.3.32"
+version = "0.3.33"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe80ced77cbfb4cb91a94bf72b378b4b6791a0d9b7f09d0be747d1bdff4e68bd"
+checksum = "00b24b79b7a07f10209f19e683ca1e289d80b1e76ffa8c2b779718566a083679"
 dependencies = [
  "deranged",
  "itoa",
@@ -6300,8 +6299,7 @@ checksum = "53a85b86a771b1c87058196170769dd264f66c0782acf1ae6cc51bfd64b39082"
 [[package]]
 name = "wgpu"
 version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30e7d227c9f961f2061c26f4cb0fbd4df0ef37e056edd0931783599d6c94ef24"
+source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
 dependencies = [
  "arrayvec 0.7.4",
  "cfg-if 1.0.0",
@@ -6325,8 +6323,7 @@ dependencies = [
 [[package]]
 name = "wgpu-core"
 version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ef91c1d62d1e9e81c79e600131a258edf75c9531cbdbde09c44a011a47312726"
+source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
 dependencies = [
  "arrayvec 0.7.4",
  "bit-vec",
@@ -6347,9 +6344,8 @@ dependencies = [
 
 [[package]]
 name = "wgpu-hal"
-version = "0.18.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b84ecc802da3eb67b4cf3dd9ea6fe45bbb47ef13e6c49c5c3240868a9cc6cdd9"
+version = "0.18.0"
+source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
 dependencies = [
  "android_system_properties",
  "arrayvec 0.7.4",
@@ -6391,8 +6387,7 @@ dependencies = [
 [[package]]
 name = "wgpu-types"
 version = "0.18.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d5ed5f0edf0de351fe311c53304986315ce866f394a2e6df0c4b3c70774bcdd"
+source = "git+https://github.com/pop-os/wgpu?branch=v0.18#868033d6754253bc51aa886f7308ac6f0fa080d7"
 dependencies = [
  "bitflags 2.4.2",
  "js-sys",
@@ -6786,9 +6781,9 @@ dependencies = [
 
 [[package]]
 name = "winnow"
-version = "0.5.36"
+version = "0.5.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "818ce546a11a9986bc24f93d0cdf38a8a1a400f1473ea8c82e59f6e0ffab9249"
+checksum = "a7cad8365489051ae9f054164e459304af2e7e9bb407c958076c8bf4aef52da5"
 dependencies = [
  "memchr",
 ]
diff --git a/Cargo.toml b/Cargo.toml
index 9cfbfab..31d4db3 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -57,6 +57,8 @@ wgpu = ["libcosmic/wgpu"]
 
 [patch.crates-io]
 smithay-client-toolkit = { git = "https://github.com/pop-os/client-toolkit", branch = "wayland-resize" }
+# https://github.com/gfx-rs/wgpu/pull/4959
+wgpu = { git = "https://github.com/pop-os/wgpu", branch = "v0.18" }
 
 [profile.release-with-debug]
 inherits = "release"