alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2024-11-23 07:21:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Update gfx with the metal clear_image fix

Browse source
This commit is contained in:
Dzmitry Malyshau 2020-08-23 00:18:42 -04:00 committed by Dzmitry Malyshau
parent 1c8ba98fd1
commit d4fbf6c0a8
2 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
Cargo.lock generated
View file

@ -231,7 +231,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-auxil" name = "gfx-auxil"
version = "0.5.0" version = "0.5.0"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "fxhash 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx-hal 0.6.0 (git+https://github.com/gfx-rs/gfx)", "gfx-hal 0.6.0 (git+https://github.com/gfx-rs/gfx)",
@ -241,7 +241,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-backend-dx11" name = "gfx-backend-dx11"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"gfx-auxil 0.5.0 (git+https://github.com/gfx-rs/gfx)", "gfx-auxil 0.5.0 (git+https://github.com/gfx-rs/gfx)",
@ -260,7 +260,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-backend-dx12" name = "gfx-backend-dx12"
version = "0.6.2" version = "0.6.2"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"d3d12 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "d3d12 0.3.2 (registry+https://github.com/rust-lang/crates.io-index)",
@ -277,7 +277,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-backend-empty" name = "gfx-backend-empty"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"gfx-hal 0.6.0 (git+https://github.com/gfx-rs/gfx)", "gfx-hal 0.6.0 (git+https://github.com/gfx-rs/gfx)",
"log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.11 (registry+https://github.com/rust-lang/crates.io-index)",
@ -287,7 +287,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-backend-metal" name = "gfx-backend-metal"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
@ -312,7 +312,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-backend-vulkan" name = "gfx-backend-vulkan"
version = "0.6.1" version = "0.6.1"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)", "arrayvec 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)",
"ash 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)", "ash 0.31.0 (registry+https://github.com/rust-lang/crates.io-index)",
@ -333,7 +333,7 @@ dependencies = [
[[package]] [[package]]
name = "gfx-hal" name = "gfx-hal"
version = "0.6.0" version = "0.6.0"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
dependencies = [ dependencies = [
"bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)", "raw-window-handle 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
@ -670,7 +670,7 @@ dependencies = [
[[package]] [[package]]
name = "range-alloc" name = "range-alloc"
version = "0.1.1" version = "0.1.1"
source = "git+https://github.com/gfx-rs/gfx#b373ebe0f057300fff76534afba25b261527db7a" source = "git+https://github.com/gfx-rs/gfx#c6fc5d5e95497fc6f7f51d0419cef59440307d78"
[[package]] [[package]]
name = "raw-window-handle" name = "raw-window-handle"

8
libportability-gfx/src/impls.rs
View file

@ -3912,8 +3912,8 @@ fn make_barriers<'a>(
}, },
}, },
}); });
let images = raw_images.iter().map(|b| { let images = raw_images.iter().flat_map(|b| {
let target = b.image.as_native().unwrap(); let target = b.image.as_native().ok()?;
let from = ( let from = (
conv::map_image_access(b.srcAccessMask), conv::map_image_access(b.srcAccessMask),
conv::map_image_layout(b.oldLayout), conv::map_image_layout(b.oldLayout),
@ -3922,12 +3922,12 @@ fn make_barriers<'a>(
conv::map_image_access(b.dstAccessMask), conv::map_image_access(b.dstAccessMask),
conv::map_image_layout(b.newLayout), conv::map_image_layout(b.newLayout),
); );
memory::Barrier::Image { Some(memory::Barrier::Image {
states: from..to, states: from..to,
target, target,
range: conv::map_subresource_range(b.subresourceRange), range: conv::map_subresource_range(b.subresourceRange),
families: None, families: None,
} })
}); });
globals.chain(buffers).chain(images).collect() globals.chain(buffers).chain(images).collect()