107: V0.2 hot fix for vertex buffers r=grovesNL a=kvark



Co-authored-by: Lain-dono <lain.dono@gmail.com>
Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
This commit is contained in:
committed 2019-03-19 04:25:07 +00:00
commit de2d0ecb9e
4 files changed
+13 -11

No files matched your search

Generated
+4 -4
View File
@@ -321,7 +321,7 @@ version = "0.1.0"
dependencies = [
"env_logger 0.5.13 (registry+https://github.com/rust-lang/crates.io-index)",
"wgpu 0.2.0",
"wgpu-native 0.2.0",
"wgpu-native 0.2.1",
]
[[package]]
@@ -1387,7 +1387,7 @@ name = "wgpu"
version = "0.2.0"
dependencies = [
"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"wgpu-native 0.2.0",
"wgpu-native 0.2.1",
]
[[package]]
@@ -1399,7 +1399,7 @@ dependencies = [
[[package]]
name = "wgpu-native"
version = "0.2.0"
version = "0.2.1"
dependencies = [
"arrayvec 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)",
"bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -1425,7 +1425,7 @@ dependencies = [
"log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
"parking_lot 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)",
"serde 1.0.89 (registry+https://github.com/rust-lang/crates.io-index)",
"wgpu-native 0.2.0",
"wgpu-native 0.2.1",
]
[[package]]
+1 -1
View File
@@ -1,6 +1,6 @@
[package]
name = "wgpu-native"
version = "0.2.0"
version = "0.2.1"
authors = [
"Dzmitry Malyshau <kvark@mozilla.com>",
"Joshua Groves <josh@joshgroves.com>",
+5 -5
View File
@@ -373,11 +373,11 @@ pub fn map_vertex_format(vertex_format: pipeline::VertexFormat) -> hal::format::
Char2 => H::Rg8Int,
Char3 => H::Rgb8Int,
Char4 => H::Rgba8Int,
UcharNorm => H::R8Srgb,
Uchar2Norm => H::Rg8Srgb,
Uchar3Norm => H::Rgb8Srgb,
Uchar4Norm => H::Rgba8Srgb,
Uchar4NormBgra => H::Bgra8Srgb,
UcharNorm => H::R8Unorm,
Uchar2Norm => H::Rg8Unorm,
Uchar3Norm => H::Rgb8Unorm,
Uchar4Norm => H::Rgba8Unorm,
Uchar4NormBgra => H::Bgra8Unorm,
CharNorm => H::R8Inorm,
Char2Norm => H::Rg8Inorm,
Char3Norm => H::Rgb8Inorm,
+3 -1
View File
@@ -149,7 +149,9 @@ pub fn instance_get_adapter(instance_id: InstanceId, desc: &AdapterDescriptor) -
PowerPreference::LowPower => low.or(high),
PowerPreference::HighPerformance | PowerPreference::Default => high.or(low),
};
some.or(other).unwrap()
some
.or(other)
.expect("No adapters found. Please enable the feature for one of the graphics backends: vulkan, metal, dx12, dx11")
}
#[cfg(feature = "local")]