From 47420b1c1ec9c6df8d32c243ab016b7cca0e42f7 Mon Sep 17 00:00:00 2001
From: maik klein <maikklein@googlemail.com>
Date: Wed, 4 Jan 2017 18:46:00 +0100
Subject: [PATCH] Refactor entry with an entry loader

---
 src/entry.rs   | 21 +++++++++++----------
 src/version.rs | 26 +++++++++++++++++++++++++-
 src/vk.rs      |  2 +-
 3 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/entry.rs b/src/entry.rs
index aa24931..b5da70b 100644
--- a/src/entry.rs
+++ b/src/entry.rs
@@ -7,7 +7,7 @@ use shared_library::dynamic_library::DynamicLibrary;
 use std::path::Path;
 use ::RawPtr;
 use std::marker::PhantomData;
-use version::{FunctionPointers, V1_0, InstanceFpV1_0, InstanceLoader};
+use version::{FunctionPointers, V1_0, InstanceFpV1_0, InstanceLoader, EntryLoader};
 
 #[cfg(windows)]
 fn get_path() -> &'static Path {
@@ -31,7 +31,7 @@ lazy_static!{
 #[derive(Clone)]
 pub struct Entry<V: FunctionPointers> {
     static_fn: vk::StaticFn,
-    entry_fn: vk::EntryFn,
+    entry_fn: V::EntryFp,
     _v: PhantomData<V>,
 }
 
@@ -47,7 +47,6 @@ pub enum InstanceError {
     LoadError(Vec<&'static str>),
     VkError(vk::Result),
 }
-
 impl<V: FunctionPointers> Entry<V> {
     pub fn create_instance(&self,
                            create_info: &vk::InstanceCreateInfo,
@@ -55,9 +54,10 @@ impl<V: FunctionPointers> Entry<V> {
                            -> Result<Instance<V>, InstanceError> {
         unsafe {
             let mut instance: vk::Instance = mem::uninitialized();
-            let err_code = self.entry_fn.create_instance(create_info,
-                                                         allocation_callbacks.as_raw_ptr(),
-                                                         &mut instance);
+            let err_code =
+                self.entry_fn.fp_v1_0().create_instance(create_info,
+                                                        allocation_callbacks.as_raw_ptr(),
+                                                        &mut instance);
             if err_code != vk::Result::Success {
                 return Err(InstanceError::VkError(err_code));
             }
@@ -80,9 +80,7 @@ impl<V: FunctionPointers> Entry<V> {
             }
             Err(ref err) => Err(LoadingError::LibraryLoadError(err.clone())),
         }?;
-        let entry_fn = vk::EntryFn::load(|name| unsafe {
-                mem::transmute(static_fn.get_instance_proc_addr(vk::Instance::null(), name.as_ptr()))
-            }).map_err(|err| LoadingError::EntryLoadError(err))?;
+        let entry_fn = unsafe { V::EntryFp::load(&static_fn).unwrap() };
         Ok(Entry {
             static_fn: static_fn,
             entry_fn: entry_fn,
@@ -93,10 +91,11 @@ impl<V: FunctionPointers> Entry<V> {
     pub fn enumerate_instance_layer_properties(&self) -> VkResult<Vec<vk::LayerProperties>> {
         unsafe {
             let mut num = 0;
-            self.entry_fn.enumerate_instance_layer_properties(&mut num, ptr::null_mut());
+            self.entry_fn.fp_v1_0().enumerate_instance_layer_properties(&mut num, ptr::null_mut());
 
             let mut v = Vec::with_capacity(num as usize);
             let err_code = self.entry_fn
+                .fp_v1_0()
                 .enumerate_instance_layer_properties(&mut num, v.as_mut_ptr());
             v.set_len(num as usize);
             match err_code {
@@ -111,9 +110,11 @@ impl<V: FunctionPointers> Entry<V> {
         unsafe {
             let mut num = 0;
             self.entry_fn
+                .fp_v1_0()
                 .enumerate_instance_extension_properties(ptr::null(), &mut num, ptr::null_mut());
             let mut data = Vec::with_capacity(num as usize);
             let err_code = self.entry_fn
+                .fp_v1_0()
                 .enumerate_instance_extension_properties(ptr::null(), &mut num, data.as_mut_ptr());
             data.set_len(num as usize);
             match err_code {
diff --git a/src/version.rs b/src/version.rs
index ed8d9f3..7608961 100644
--- a/src/version.rs
+++ b/src/version.rs
@@ -5,6 +5,7 @@ use std::mem;
 pub trait FunctionPointers {
     type InstanceFp: InstanceLoader;
     type DeviceFp: DeviceLoader;
+    type EntryFp: EntryLoader;
 }
 
 #[allow(non_camel_case_types)]
@@ -12,6 +13,7 @@ pub struct V1_0;
 impl FunctionPointers for V1_0 {
     type InstanceFp = InstanceFpV1_0;
     type DeviceFp = DeviceFpV1_0;
+    type EntryFp = EntryFpV1_0;
 }
 
 #[allow(non_camel_case_types)]
@@ -19,6 +21,28 @@ pub struct InstanceFpV1_0 {
     pub instance_fn: vk::InstanceFnV1_0,
 }
 
+#[allow(non_camel_case_types)]
+pub struct EntryFpV1_0 {
+    pub entry_fn: vk::EntryFnV1_0,
+}
+
+impl EntryLoader for EntryFpV1_0 {
+    fn fp_v1_0(&self) -> &vk::EntryFnV1_0 {
+        &self.entry_fn
+    }
+    unsafe fn load(static_fn: &vk::StaticFn) -> Result<Self, Vec<&'static str>> {
+        let entry_fn = vk::EntryFnV1_0::load(|name| {
+            mem::transmute(static_fn.get_instance_proc_addr(vk::Instance::null(), name.as_ptr()))
+        })?;
+        Ok(EntryFpV1_0 { entry_fn: entry_fn })
+    }
+}
+
+pub trait EntryLoader: Sized {
+    fn fp_v1_0(&self) -> &vk::EntryFnV1_0;
+    unsafe fn load(static_fn: &vk::StaticFn) -> Result<Self, Vec<&'static str>>;
+}
+
 pub trait InstanceLoader: Sized {
     fn fp_v1_0(&self) -> &vk::InstanceFnV1_0;
     unsafe fn load(static_fn: &vk::StaticFn,
@@ -44,7 +68,7 @@ impl DeviceLoader for DeviceFpV1_0 {
 }
 
 impl InstanceLoader for InstanceFpV1_0 {
-    fn fp_v1_0(&self) -> &vk::InstanceFnV1_0{
+    fn fp_v1_0(&self) -> &vk::InstanceFnV1_0 {
         &self.instance_fn
     }
     unsafe fn load(static_fn: &vk::StaticFn,
diff --git a/src/vk.rs b/src/vk.rs
index d85db6b..e6072e2 100644
--- a/src/vk.rs
+++ b/src/vk.rs
@@ -3711,7 +3711,7 @@ vk_functions!{
 }
 
 vk_functions!{
-    EntryFn,
+    EntryFnV1_0,
     "vkCreateInstance", create_instance(
         p_create_info: *const InstanceCreateInfo,
         p_allocator: *const AllocationCallbacks,