From 6ad83bed4c4a879e0f2fa16e2b8d0c8046fd08f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Kro=C5=A1l=C3=A1k?= <kroslakma@gmail.com>
Date: Wed, 22 Jan 2020 06:51:33 +0100
Subject: [PATCH] Fix rustc warnings

---
 libportability-gfx/src/handle.rs |  2 +-
 libportability-gfx/src/impls.rs  | 39 +++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/libportability-gfx/src/handle.rs b/libportability-gfx/src/handle.rs
index 419faa9..02fc02a 100644
--- a/libportability-gfx/src/handle.rs
+++ b/libportability-gfx/src/handle.rs
@@ -37,7 +37,7 @@ impl<T> HandleAllocation<T> {
         #[cfg(feature = "nightly")]
         {
             use std::intrinsics::type_name;
-            let name = unsafe { type_name::<T>() };
+            let name = type_name::<T>();
             REGISTRY.lock().unwrap().insert(ptr as _, name);
         }
         Handle(ptr)
diff --git a/libportability-gfx/src/impls.rs b/libportability-gfx/src/impls.rs
index 591298a..2711fe9 100644
--- a/libportability-gfx/src/impls.rs
+++ b/libportability-gfx/src/impls.rs
@@ -62,6 +62,8 @@ pub extern "C" fn gfxCreateInstance(
         let _ = env_logger::try_init();
     }
 
+    #[allow(unused_mut)]
+    // Metal branch performs mutation, so we silence the warning on other backends.
     let mut backend =
         back::Instance::create("portability", 1).expect("failed to create backend instance");
 
@@ -2074,13 +2076,11 @@ pub extern "C" fn gfxCreateGraphicsPipelines(
         };
 
         let shaders = {
-            let mut set = pso::GraphicsShaderSet {
-                vertex: unsafe { mem::zeroed() }, // fake entry point
-                hull: None,
-                domain: None,
-                geometry: None,
-                fragment: None,
-            };
+            let mut vertex = mem::MaybeUninit::uninit();
+            let mut hull = None;
+            let mut domain = None;
+            let mut geometry = None;
+            let mut fragment = None;
 
             let stages = unsafe { slice::from_raw_parts(info.pStages, info.stageCount as _) };
 
@@ -2109,26 +2109,31 @@ pub extern "C" fn gfxCreateGraphicsPipelines(
 
                 match stage.stage {
                     VK_SHADER_STAGE_VERTEX_BIT => {
-                        let fake_vs_entry = mem::replace(&mut set.vertex, entry_point);
-                        mem::forget(fake_vs_entry);
+                        vertex = mem::MaybeUninit::new(entry_point);
                     }
                     VK_SHADER_STAGE_TESSELLATION_CONTROL_BIT => {
-                        set.hull = Some(entry_point);
+                        hull = Some(entry_point);
                     }
                     VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT => {
-                        set.domain = Some(entry_point);
+                        domain = Some(entry_point);
                     }
                     VK_SHADER_STAGE_GEOMETRY_BIT => {
-                        set.geometry = Some(entry_point);
+                        geometry = Some(entry_point);
                     }
                     VK_SHADER_STAGE_FRAGMENT_BIT if !rasterizer_discard => {
-                        set.fragment = Some(entry_point);
+                        fragment = Some(entry_point);
                     }
                     stage => panic!("Unexpected shader stage: {:?}", stage),
                 }
             }
 
-            set
+            pso::GraphicsShaderSet {
+                vertex: unsafe { vertex.assume_init() },
+                hull,
+                domain,
+                geometry,
+                fragment,
+            }
         };
 
         let (vertex_buffers, attributes) = {
@@ -4413,8 +4418,8 @@ pub extern "C" fn gfxGetPhysicalDeviceSurfacePresentModesKHR(
 
 #[inline]
 pub extern "C" fn gfxGetPhysicalDeviceWin32PresentationSupportKHR(
-    adapter: VkPhysicalDevice,
-    queueFamilyIndex: u32,
+    _adapter: VkPhysicalDevice,
+    _queueFamilyIndex: u32,
 ) -> VkBool32 {
     VK_TRUE
 }
@@ -4443,6 +4448,8 @@ pub extern "C" fn gfxCreateSwapchainKHR(
         image_layers: 1,
         image_usage: conv::map_image_usage(info.imageUsage),
     };
+
+    #[allow(unused_mut)] // Metal branch performs mutation.
     let (mut swapchain, backbuffers) = match unsafe {
         gpu.device.create_swapchain(
             &mut info.surface.clone(),