Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1829121 - Update wgpu to revision 25cb9f61e9a6be572ee42536bbe57aa5f759a700. r=webgpu-reviewers,ErichDonGubler

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D176057
This commit is contained in:
Nicolas Silva 2023-04-21 15:39:25 +00:00
parent b2796c59ad
commit 08d60b6df2
4 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Cargo.lock generated
View File

@ -3486,8 +3486,8 @@ checksum = "a2983372caf4480544083767bf2d27defafe32af49ab4df3a0b7fc90793a3664"
[[package]]
name = "naga"
version = "0.11.0"
source = "git+https://github.com/gfx-rs/naga?rev=f59668ccfaf7bdb3a7e43d84363a21c77357b2fe#f59668ccfaf7bdb3a7e43d84363a21c77357b2fe"
version = "0.12.0"
source = "git+https://github.com/gfx-rs/naga?rev=b99d58ea435090e561377949f428bce2c18451bb#b99d58ea435090e561377949f428bce2c18451bb"
dependencies = [
"bit-set",
"bitflags 1.3.2",
@ -6122,8 +6122,8 @@ dependencies = [
[[package]]
name = "wgpu-core"
version = "0.15.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=f3bf0f782e4dfc561d48e758e1f1e04f77860925#f3bf0f782e4dfc561d48e758e1f1e04f77860925"
version = "0.16.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=25cb9f61e9a6be572ee42536bbe57aa5f759a700#25cb9f61e9a6be572ee42536bbe57aa5f759a700"
dependencies = [
"arrayvec",
"bit-vec",
@ -6131,7 +6131,7 @@ dependencies = [
"codespan-reporting",
"log",
"naga",
"parking_lot 0.12.999",
"parking_lot 0.11.2",
"profiling",
"ron",
"rustc-hash",
@ -6145,8 +6145,8 @@ dependencies = [
[[package]]
name = "wgpu-hal"
version = "0.15.1"
source = "git+https://github.com/gfx-rs/wgpu?rev=f3bf0f782e4dfc561d48e758e1f1e04f77860925#f3bf0f782e4dfc561d48e758e1f1e04f77860925"
version = "0.16.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=25cb9f61e9a6be572ee42536bbe57aa5f759a700#25cb9f61e9a6be572ee42536bbe57aa5f759a700"
dependencies = [
"android_system_properties",
"arrayvec",
@ -6167,7 +6167,7 @@ dependencies = [
"metal",
"naga",
"objc",
"parking_lot 0.12.999",
"parking_lot 0.11.2",
"profiling",
"range-alloc",
"raw-window-handle",
@ -6182,8 +6182,8 @@ dependencies = [
[[package]]
name = "wgpu-types"
version = "0.15.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=f3bf0f782e4dfc561d48e758e1f1e04f77860925#f3bf0f782e4dfc561d48e758e1f1e04f77860925"
version = "0.16.0"
source = "git+https://github.com/gfx-rs/wgpu?rev=25cb9f61e9a6be572ee42536bbe57aa5f759a700#25cb9f61e9a6be572ee42536bbe57aa5f759a700"
dependencies = [
"bitflags 2.999.999",
"js-sys",

2
dom/webgpu/ipc/WebGPUChild.cpp
View File

@ -189,7 +189,7 @@ static ffi::WGPUTextureFormat ConvertTextureFormat(
result.tag = ffi::WGPUTextureFormat_Bc6hRgbUfloat;
break;
case dom::GPUTextureFormat::Bc6h_rgb_float:
result.tag = ffi::WGPUTextureFormat_Bc6hRgbSfloat;
result.tag = ffi::WGPUTextureFormat_Bc6hRgbFloat;
break;
case dom::GPUTextureFormat::Bc7_rgba_unorm:
result.tag = ffi::WGPUTextureFormat_Bc7RgbaUnorm;

12
gfx/wgpu_bindings/Cargo.toml
View File

@ -17,7 +17,7 @@ default = []
[dependencies.wgc]
package = "wgpu-core"
git = "https://github.com/gfx-rs/wgpu"
rev = "f3bf0f782e4dfc561d48e758e1f1e04f77860925"
rev = "25cb9f61e9a6be572ee42536bbe57aa5f759a700"
#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 = "f3bf0f782e4dfc561d48e758e1f1e04f77860925"
rev = "25cb9f61e9a6be572ee42536bbe57aa5f759a700"
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 = "f3bf0f782e4dfc561d48e758e1f1e04f77860925"
rev = "25cb9f61e9a6be572ee42536bbe57aa5f759a700"
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 = "f3bf0f782e4dfc561d48e758e1f1e04f77860925"
rev = "25cb9f61e9a6be572ee42536bbe57aa5f759a700"
features = ["vulkan"]
[dependencies.wgt]
package = "wgpu-types"
git = "https://github.com/gfx-rs/wgpu"
rev = "f3bf0f782e4dfc561d48e758e1f1e04f77860925"
rev = "25cb9f61e9a6be572ee42536bbe57aa5f759a700"
[dependencies.wgh]
package = "wgpu-hal"
git = "https://github.com/gfx-rs/wgpu"
rev = "f3bf0f782e4dfc561d48e758e1f1e04f77860925"
rev = "25cb9f61e9a6be572ee42536bbe57aa5f759a700"
[dependencies]
bincode = "1"

4
gfx/wgpu_bindings/moz.yaml
View File

@ -20,11 +20,11 @@ origin:
# Human-readable identifier for this version/release
# Generally "version NNN", "tag SSS", "bookmark SSS"
release: commit f3bf0f782e4dfc561d48e758e1f1e04f77860925
release: commit 25cb9f61e9a6be572ee42536bbe57aa5f759a700
# Revision to pull in
# Must be a long or short commit SHA (long preferred)
revision: f3bf0f782e4dfc561d48e758e1f1e04f77860925
revision: 25cb9f61e9a6be572ee42536bbe57aa5f759a700
license: ['MIT', 'Apache-2.0']