Skip to content

Commit 07728a3

Browse files
update wgpu to v0.17.0 (#282)
1 parent 44e1f3a commit 07728a3

File tree

4 files changed

+76
-60
lines changed

4 files changed

+76
-60
lines changed

Cargo.lock

Lines changed: 57 additions & 41 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,45 +30,45 @@ trace = ["wgc/trace"]
3030
[dependencies.wgc]
3131
package = "wgpu-core"
3232
git = "https://github.com/gfx-rs/wgpu"
33-
rev = "6c84d438a5335b18234c47830f9eb5a810ae8c21"
34-
version = "0.16"
33+
rev = "21098cdaceee49c22a7e3a9648ce019b4e74beec"
34+
version = "0.17"
3535
features = ["raw-window-handle", "gles"]
3636

3737
[target.'cfg(any(target_os = "macos", target_os = "ios"))'.dependencies.wgc]
3838
package = "wgpu-core"
3939
git = "https://github.com/gfx-rs/wgpu"
40-
rev = "6c84d438a5335b18234c47830f9eb5a810ae8c21"
41-
version = "0.16"
40+
rev = "21098cdaceee49c22a7e3a9648ce019b4e74beec"
41+
version = "0.17"
4242
features = ["metal"]
4343

4444
[target.'cfg(windows)'.dependencies.wgc]
4545
package = "wgpu-core"
4646
git = "https://github.com/gfx-rs/wgpu"
47-
rev = "6c84d438a5335b18234c47830f9eb5a810ae8c21"
48-
version = "0.16"
47+
rev = "21098cdaceee49c22a7e3a9648ce019b4e74beec"
48+
version = "0.17"
4949
features = ["dx11", "dx12"]
5050

5151
[target.'cfg(any(windows, all(unix, not(target_arch = "emscripten"), not(target_os = "ios"), not(target_os = "macos"))))'.dependencies.wgc]
5252
package = "wgpu-core"
5353
git = "https://github.com/gfx-rs/wgpu"
54-
rev = "6c84d438a5335b18234c47830f9eb5a810ae8c21"
55-
version = "0.16"
54+
rev = "21098cdaceee49c22a7e3a9648ce019b4e74beec"
55+
version = "0.17"
5656
features = ["vulkan"]
5757

5858
[dependencies.wgt]
5959
package = "wgpu-types"
6060
git = "https://github.com/gfx-rs/wgpu"
61-
rev = "6c84d438a5335b18234c47830f9eb5a810ae8c21"
62-
version = "0.16"
61+
rev = "21098cdaceee49c22a7e3a9648ce019b4e74beec"
62+
version = "0.17"
6363

6464
[dependencies.naga]
6565
git = "https://github.com/gfx-rs/naga"
66-
rev = "b99d58ea435090e561377949f428bce2c18451bb"
67-
version = "0.12.0"
66+
rev = "bac2d82a430fbfcf100ee22b7c3bc12f3d593079"
67+
version = "0.13.0"
6868

6969
[dependencies]
7070
raw-window-handle = "0.5"
71-
paste = "1.0"
71+
paste = "1"
7272
log = "0.4"
7373
thiserror = "1"
7474
parking_lot = "0.12"

src/conv.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -902,7 +902,7 @@ pub fn map_primitive_state(
902902
}
903903

904904
#[inline]
905-
pub fn map_storage_report(report: wgc::hub::StorageReport) -> native::WGPUStorageReport {
905+
pub fn map_storage_report(report: wgc::storage::StorageReport) -> native::WGPUStorageReport {
906906
native::WGPUStorageReport {
907907
numOccupied: report.num_occupied,
908908
numVacant: report.num_error,
@@ -935,7 +935,7 @@ pub fn map_hub_report(report: wgc::hub::HubReport) -> native::WGPUHubReport {
935935
#[inline]
936936
pub fn write_global_report(
937937
native_report: &mut native::WGPUGlobalReport,
938-
report: wgc::hub::GlobalReport,
938+
report: wgc::global::GlobalReport,
939939
) {
940940
native_report.surfaces = map_storage_report(report.surfaces);
941941

src/lib.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ pub mod native {
3737

3838
const LABEL: &str = "label";
3939

40-
pub type Context = wgc::hub::Global<wgc::hub::IdentityManagerFactory>;
40+
pub type Context = wgc::global::Global<wgc::identity::IdentityManagerFactory>;
4141

4242
struct AdapterProperties {
4343
vendor_id: u32,
@@ -553,7 +553,7 @@ pub unsafe extern "C" fn wgpuCreateInstance(
553553
Arc::into_raw(Arc::new(WGPUInstanceImpl {
554554
context: Arc::new(Context::new(
555555
"wgpu",
556-
wgc::hub::IdentityManagerFactory,
556+
wgc::identity::IdentityManagerFactory,
557557
instance_desc,
558558
)),
559559
}))
@@ -617,10 +617,10 @@ pub unsafe extern "C" fn wgpuAdapterGetProperties(
617617
let props = adapter.properties.get_or_init(|| {
618618
match gfx_select!(adapter_id => context.adapter_get_info(adapter_id)) {
619619
Ok(info) => AdapterProperties {
620-
vendor_id: info.vendor as u32,
620+
vendor_id: info.vendor,
621621
vendor_name: CString::new(info.driver).unwrap(),
622622
architecture: CString::default(), // TODO
623-
device_id: info.device as u32,
623+
device_id: info.device,
624624
name: CString::new(info.name).unwrap(),
625625
driver_description: CString::new(info.driver_info).unwrap(),
626626
adapter_type: match info.device_type {

0 commit comments

Comments
 (0)