Merge #166

166: gfx update for image view capabilities r=grovesNL a=kvark Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
gfx-rs · Sep 12, 2018 · 25918bb · 25918bb
2 parents 402c2fb + eb06b8c
commit 25918bb
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/libportability-gfx/src/conv.rs b/libportability-gfx/src/conv.rs
@@ -195,6 +195,10 @@ pub fn map_aspect(aspects: VkImageAspectFlags) -> format::Aspects {
     flags
 }
 
+pub fn map_image_create_flags(flags: VkImageCreateFlags) -> image::ViewCapabilities {
+    image::ViewCapabilities::from_bits_truncate(flags as u32)
+}
+
 pub fn map_image_kind(
     ty: VkImageType,
     extent: VkExtent3D,

diff --git a/libportability-gfx/src/impls.rs b/libportability-gfx/src/impls.rs
@@ -286,7 +286,7 @@ pub extern "C" fn gfxGetPhysicalDeviceImageFormatProperties(
         },
         conv::map_tiling(tiling),
         conv::map_image_usage(usage),
-        unsafe { mem::transmute(create_flags) },
+        conv::map_image_create_flags(create_flags),
     );
     match properties {
         Some(props) => unsafe {
@@ -1552,7 +1552,7 @@ pub extern "C" fn gfxCreateImage(
                 .expect(&format!("Unsupported image format: {:?}", info.format)),
             conv::map_tiling(info.tiling),
             conv::map_image_usage(info.usage),
-            unsafe { mem::transmute(info.flags) },
+            conv::map_image_create_flags(info.flags),
         )
         .expect("Error on creating image");