alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #108 from GabrielMajeri/entry-1.1

Browse source 
Make `enumerate_instance_version` an `Entry` function
This commit is contained in:
Maik Klein 2018-08-23 07:13:08 +02:00 committed by GitHub
parent b84596fb9a c4d92d410b
commit 9edecfd476
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 83 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
ash/src/entry.rs
View file

@ -6,7 +6,7 @@ use std::fmt;
use std::mem;
use std::path::Path;
use std::ptr;
use version::{EntryLoader, FunctionPointers, InstanceLoader, V1_0};
use version::{EntryLoader, FunctionPointers, InstanceLoader, V1_0, V1_1};
use vk;
use RawPtr;
@ -150,6 +150,22 @@ impl EntryV1_0 for Entry<V1_0> {
}
}
impl EntryV1_0 for Entry<V1_1> {
type Fp = V1_1;
fn fp_v1_0(&self) -> &vk::EntryFnV1_0 {
self.entry_fn.fp_v1_0()
}
fn static_fn(&self) -> &vk::StaticFn {
&self.static_fn
}
}
impl EntryV1_1 for Entry<V1_1> {
fn fp_v1_1(&self) -> &vk::EntryFnV1_1 {
&self.entry_fn.entry_fn_1_1
}
}
impl<V: FunctionPointers> Entry<V> {
pub fn new() -> Result<Self, LoadingError> {
let lib = VK_LIB
@ -170,3 +186,19 @@ impl<V: FunctionPointers> Entry<V> {
})
}
}
#[allow(non_camel_case_types)]
pub trait EntryV1_1: EntryV1_0 {
fn fp_v1_1(&self) -> &vk::EntryFnV1_1;
fn enumerate_instance_version(&self) -> VkResult<vk::uint32_t> {
unsafe {
let mut api_version = 0;
let err_code = self.fp_v1_1().enumerate_instance_version(&mut api_version);
match err_code {
vk::Result::SUCCESS => Ok(api_version),
_ => Err(err_code),
}
}
}
}

9
ash/src/instance.rs
View file

@ -86,15 +86,6 @@ impl<V: FunctionPointers> Instance<V> {
pub trait InstanceV1_1: InstanceV1_0 {
fn fp_v1_1(&self) -> &vk::InstanceFnV1_1;
unsafe fn enumerate_instance_version(&self) -> VkResult<vk::uint32_t> {
let mut api_version = mem::uninitialized();
let err_code = self.fp_v1_1().enumerate_instance_version(&mut api_version);
match err_code {
vk::Result::SUCCESS => Ok(api_version),
_ => Err(err_code),
}
}
fn enumerate_physical_device_groups(&self) -> VkResult<Vec<vk::PhysicalDeviceGroupProperties>> {
unsafe {
let mut group_count = mem::uninitialized();

30
ash/src/version.rs
View file

@ -1,5 +1,5 @@
pub use device::{DeviceV1_0, DeviceV1_1};
pub use entry::EntryV1_0;
pub use entry::{EntryV1_0, EntryV1_1};
pub use instance::{InstanceV1_0, InstanceV1_1};
use std::mem;
use vk;
@ -15,7 +15,7 @@ pub struct V1_1;
impl FunctionPointers for V1_1 {
type InstanceFp = InstanceFpV1_1;
type DeviceFp = DeviceFpV1_1;
type EntryFp = EntryFpV1_0;
type EntryFp = EntryFpV1_1;
}
#[allow(non_camel_case_types)]
@ -50,6 +50,32 @@ pub trait EntryLoader: Sized {
unsafe fn load(static_fn: &vk::StaticFn) -> Result<Self, Vec<&'static str>>;
}
#[allow(non_camel_case_types)]
#[derive(Clone)]
pub struct EntryFpV1_1 {
pub entry_fn_1_0: vk::EntryFnV1_0,
pub entry_fn_1_1: vk::EntryFnV1_1,
}
impl EntryLoader for EntryFpV1_1 {
fn fp_v1_0(&self) -> &vk::EntryFnV1_0 {
&self.entry_fn_1_0
}
unsafe fn load(static_fn: &vk::StaticFn) -> Result<Self, Vec<&'static str>> {
let entry_fn_1_0 = vk::EntryFnV1_0::load(|name| {
mem::transmute(static_fn.get_instance_proc_addr(vk::Instance::null(), name.as_ptr()))
})?;
let entry_fn_1_1 = vk::EntryFnV1_1::load(|name| {
mem::transmute(static_fn.get_instance_proc_addr(vk::Instance::null(), name.as_ptr()))
})?;
Ok(EntryFpV1_1 {
entry_fn_1_0,
entry_fn_1_1,
})
}
}
pub trait InstanceLoader: Sized {
unsafe fn load(
static_fn: &vk::StaticFn,

37
ash/src/vk.rs
View file

@ -3844,12 +3844,16 @@ impl DeviceFnV1_0 {
(self.cmd_execute_commands)(command_buffer, command_buffer_count, p_command_buffers)
}
}
pub struct EntryFnV1_1 {}
pub struct EntryFnV1_1 {
enumerate_instance_version: extern "system" fn(p_api_version: *mut uint32_t) -> Result,
}
unsafe impl Send for EntryFnV1_1 {}
unsafe impl Sync for EntryFnV1_1 {}
impl ::std::clone::Clone for EntryFnV1_1 {
fn clone(&self) -> Self {
EntryFnV1_1 {}
EntryFnV1_1 {
enumerate_instance_version: self.enumerate_instance_version,
}
}
}
impl EntryFnV1_1 {
@ -3858,16 +3862,28 @@ impl EntryFnV1_1 {
F: FnMut(&::std::ffi::CStr) -> *const c_void,
{
let mut _err_str = Vec::new();
let s = EntryFnV1_1 {};
let s = EntryFnV1_1 {
enumerate_instance_version: unsafe {
let raw_name = stringify!(vkEnumerateInstanceVersion);
let cname = ::std::ffi::CString::new(raw_name).unwrap();
let val = _f(&cname);
if val.is_null() {
_err_str.push(raw_name);
}
::std::mem::transmute(val)
},
};
if _err_str.is_empty() {
Ok(s)
} else {
Err(_err_str)
}
}
pub unsafe fn enumerate_instance_version(&self, p_api_version: *mut uint32_t) -> Result {
(self.enumerate_instance_version)(p_api_version)
}
}
pub struct InstanceFnV1_1 {
enumerate_instance_version: extern "system" fn(p_api_version: *mut uint32_t) -> Result,
enumerate_physical_device_groups:
extern "system" fn(
instance: Instance,
@ -3937,7 +3953,6 @@ unsafe impl Sync for InstanceFnV1_1 {}
impl ::std::clone::Clone for InstanceFnV1_1 {
fn clone(&self) -> Self {
InstanceFnV1_1 {
enumerate_instance_version: self.enumerate_instance_version,
enumerate_physical_device_groups: self.enumerate_physical_device_groups,
get_physical_device_features2: self.get_physical_device_features2,
get_physical_device_properties2: self.get_physical_device_properties2,
@ -3965,15 +3980,6 @@ impl InstanceFnV1_1 {
{
let mut _err_str = Vec::new();
let s = InstanceFnV1_1 {
enumerate_instance_version: unsafe {
let raw_name = stringify!(vkEnumerateInstanceVersion);
let cname = ::std::ffi::CString::new(raw_name).unwrap();
let val = _f(&cname);
if val.is_null() {
_err_str.push(raw_name);
}
::std::mem::transmute(val)
},
enumerate_physical_device_groups: unsafe {
let raw_name = stringify!(vkEnumeratePhysicalDeviceGroups);
let cname = ::std::ffi::CString::new(raw_name).unwrap();
@ -4080,9 +4086,6 @@ impl InstanceFnV1_1 {
Err(_err_str)
}
}
pub unsafe fn enumerate_instance_version(&self, p_api_version: *mut uint32_t) -> Result {
(self.enumerate_instance_version)(p_api_version)
}
pub unsafe fn enumerate_physical_device_groups(
&self,
instance: Instance,

3
generator/src/lib.rs
View file

@ -540,7 +540,8 @@ impl CommandExt for vkxml::Command {
"vkGetInstanceProcAddr" => FunctionType::Static,
"vkCreateInstance"
| "vkEnumerateInstanceLayerProperties"
| "vkEnumerateInstanceExtensionProperties" => FunctionType::Entry,
| "vkEnumerateInstanceExtensionProperties"
| "vkEnumerateInstanceVersion" => FunctionType::Entry,
// This is actually not a device level function
"vkGetDeviceProcAddr" => FunctionType::Instance,
_ => {