Backed out changeset 674dc1b6026b (bug 1838493) for webrender standal…

…one related build bustages.CLOSED TREE
dothq · Jul 5, 2023 · 1f73e88 · 1f73e88
1 parent b739a20
commit 1f73e88
Show file tree

Hide file tree

Showing 261 changed files with 13,144 additions and 25,379 deletions.
diff --git a/.cargo/config.in b/.cargo/config.in
@@ -30,14 +30,14 @@ git = "https://github.com/gfx-rs/d3d12-rs"
 rev = "b940b1d71"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/naga?rev=76003dc0035d53a474d366dcdf49d2e4d12e921f"]
+[source."git+https://github.com/gfx-rs/naga?rev=b99d58ea435090e561377949f428bce2c18451bb"]
 git = "https://github.com/gfx-rs/naga"
-rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f"
+rev = "b99d58ea435090e561377949f428bce2c18451bb"
 replace-with = "vendored-sources"
 
-[source."git+https://github.com/gfx-rs/wgpu?rev=dcad7dfba92dd85c3ca21bb553a61834e01b04f5"]
+[source."git+https://github.com/gfx-rs/wgpu?rev=f71a1bc736fde37509262ca03e91d8f56a13aeb5"]
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 replace-with = "vendored-sources"
 
 [source."git+https://github.com/glandium/warp?rev=4af45fae95bc98b0eba1ef0db17e1dac471bb23d"]

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build/rust/bitflags/Cargo.toml b/build/rust/bitflags/Cargo.toml
@@ -7,8 +7,5 @@ license = "MIT/Apache-2.0"
 [lib]
 path = "lib.rs"
 
-[features]
-serde = []
-
 [dependencies.bitflags]
 version = "1.0"
diff --git a/gfx/webrender_bindings/Cargo.toml b/gfx/webrender_bindings/Cargo.toml
@@ -35,6 +35,6 @@ winapi = "0.3"
 
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = "0.9"
-core-graphics = "0.23"
-foreign-types = "0.5.0"
+core-graphics = "0.22"
+foreign-types = "0.3.0"
 objc = "0.2"
diff --git a/gfx/wgpu_bindings/Cargo.toml b/gfx/wgpu_bindings/Cargo.toml
@@ -17,7 +17,7 @@ default = []
 [dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 #Note: "replay" shouldn't ideally be needed,
 # but it allows us to serialize everything across IPC.
 features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
@@ -27,32 +27,32 @@ features = ["replay", "trace", "serial-pass", "strict_asserts", "wgsl"]
 [target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 features = ["metal"]
 
 # We want the wgpu-core Direct3D backends on Windows.
 [target.'cfg(windows)'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 features = ["dx11", "dx12"]
 
 # We want the wgpu-core Vulkan backend on Linux and Windows.
 [target.'cfg(any(windows, all(unix, not(any(target_os = "macos", target_os = "ios")))))'.dependencies.wgc]
 package = "wgpu-core"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 features = ["vulkan"]
 
 [dependencies.wgt]
 package = "wgpu-types"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 
 [dependencies.wgh]
 package = "wgpu-hal"
 git = "https://github.com/gfx-rs/wgpu"
-rev = "dcad7dfba92dd85c3ca21bb553a61834e01b04f5"
+rev = "f71a1bc736fde37509262ca03e91d8f56a13aeb5"
 
 [dependencies]
 bincode = "1"

diff --git a/gfx/wgpu_bindings/moz.yaml b/gfx/wgpu_bindings/moz.yaml
@@ -20,11 +20,11 @@ origin:
 
   # Human-readable identifier for this version/release
   # Generally "version NNN", "tag SSS", "bookmark SSS"
-  release: commit dcad7dfba92dd85c3ca21bb553a61834e01b04f5
+  release: commit f71a1bc736fde37509262ca03e91d8f56a13aeb5
 
   # Revision to pull in
   # Must be a long or short commit SHA (long preferred)
-  revision: dcad7dfba92dd85c3ca21bb553a61834e01b04f5
+  revision: f71a1bc736fde37509262ca03e91d8f56a13aeb5
 
   license: ['MIT', 'Apache-2.0']
 

diff --git a/gfx/wgpu_bindings/src/client.rs b/gfx/wgpu_bindings/src/client.rs
@@ -7,7 +7,7 @@ use crate::{
     DropAction, ImageDataLayout, ImplicitLayout, QueueWriteAction, RawString, TextureAction,
 };
 
-use wgc::{identity::IdentityManager, id};
+use wgc::{hub::IdentityManager, id};
 use wgt::{Backend, TextureFormat};
 
 pub use wgc::command::{compute_ffi::*, render_ffi::*};