Skip to content

Fix convert.rs #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Makogan wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix convert.rs #25

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0edc9e4
Fix convert.rs
Makogan Mar 5, 2024
a991d7b
Fix compilation errors in convert.rs
Makogan Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 17 additions & 6 deletions src/convert.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,11 @@ pub(crate) fn ffi_to_interface_variable(
ffi_type_ptr: *const ffi::SpvReflectInterfaceVariable,
) -> ReflectInterfaceVariable {
let ffi_type = unsafe { &*ffi_type_ptr };
let ffi_members =
unsafe { std::slice::from_raw_parts(ffi_type.members, ffi_type.member_count as usize) };
let ffi_members = if ffi_type.member_count as usize > 0 {
unsafe { std::slice::from_raw_parts(ffi_type.members, ffi_type.member_count as usize) }
} else {
Vec::new()
};
let members: Vec<ReflectInterfaceVariable> = ffi_members
.iter()
.map(|member| ffi_to_interface_variable(member))
Expand Down Expand Up @@ -96,8 +99,12 @@ pub(crate) fn ffi_to_interface_variable(
pub(crate) fn ffi_to_type_description(
ffi_type: &ffi::SpvReflectTypeDescription,
) -> ReflectTypeDescription {
let ffi_members =
unsafe { std::slice::from_raw_parts(ffi_type.members, ffi_type.member_count as usize) };
let empty = Vec::new();
let ffi_members = if ffi_type.member_count as usize > 0 {
unsafe { std::slice::from_raw_parts(ffi_type.members, ffi_type.member_count as usize) }
} else {
&empty
};
let members: Vec<ReflectTypeDescription> = ffi_members
.iter()
.map(|member| ffi_to_type_description(member))
Expand Down Expand Up @@ -466,8 +473,12 @@ pub(crate) fn ffi_to_binding_array_traits(
pub(crate) fn ffi_to_block_variable(
ffi_type: &ffi::SpvReflectBlockVariable,
) -> ReflectBlockVariable {
let ffi_members =
unsafe { std::slice::from_raw_parts(ffi_type.members, ffi_type.member_count as usize) };
let empty = Vec::new();
let ffi_members = if ffi_type.member_count as usize > 0 {
unsafe { std::slice::from_raw_parts(ffi_type.members, ffi_type.member_count as usize) }
} else {
&empty
};
let members: Vec<ReflectBlockVariable> = ffi_members
.iter()
.map(|member| ffi_to_block_variable(member))
Expand Down