Skip to content
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

extensions/amd/shader_info: Replace unreachable ShaderInfoResult with 3 specialized functions #901

Merged
merged 1 commit into from
Apr 1, 2024
Merged

extensions/amd/shader_info: Replace unreachable ShaderInfoResult with 3 specialized functions #901

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
84 changes: 46 additions & 38 deletions ash/src/extensions/amd/shader_info.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,55 +6,63 @@ use alloc::vec::Vec;
use core::mem;

impl crate::amd::shader_info::Device {
/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkGetShaderInfoAMD.html>
/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkGetShaderInfoAMD.html> with [`vk::ShaderInfoTypeAMD::STATISTICS`]
#[inline]
pub unsafe fn get_shader_info(
pub unsafe fn get_shader_info_statistics(
&self,
pipeline: vk::Pipeline,
shader_stage: vk::ShaderStageFlags,
info_type: vk::ShaderInfoTypeAMD,
) -> VkResult<ShaderInfoResult> {
let load_data = |count: &mut usize, data: *mut u8| {
) -> VkResult<vk::ShaderStatisticsInfoAMD> {
let mut info = mem::MaybeUninit::<vk::ShaderStatisticsInfoAMD>::uninit();
let mut size = mem::size_of_val(&info);
(self.fp.get_shader_info_amd)(
self.handle,
pipeline,
shader_stage,
vk::ShaderInfoTypeAMD::STATISTICS,
&mut size,
info.as_mut_ptr().cast(),
)
.result()?;
assert_eq!(size, mem::size_of_val(&info));
Ok(info.assume_init())
}

/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkGetShaderInfoAMD.html> with [`vk::ShaderInfoTypeAMD::BINARY`]
#[inline]
pub unsafe fn get_shader_info_binary(
&self,
pipeline: vk::Pipeline,
shader_stage: vk::ShaderStageFlags,
) -> VkResult<Vec<u8>> {
read_into_uninitialized_vector(|count, data: *mut u8| {
(self.fp.get_shader_info_amd)(
self.handle,
pipeline,
shader_stage,
info_type,
vk::ShaderInfoTypeAMD::BINARY,
count,
data.cast(),
)
};

match info_type {
vk::ShaderInfoTypeAMD::STATISTICS => {
let mut statistics_info = mem::MaybeUninit::<vk::ShaderStatisticsInfoAMD>::uninit();
load_data(
&mut mem::size_of_val(&statistics_info),
statistics_info.as_mut_ptr().cast(),
)
.result()?;
Ok(ShaderInfoResult::StatisticsInfo(
statistics_info.assume_init(),
))
}
vk::ShaderInfoTypeAMD::BINARY => {
read_into_uninitialized_vector(load_data).map(ShaderInfoResult::Binary)
}
vk::ShaderInfoTypeAMD::DISASSEMBLY => {
read_into_uninitialized_vector(load_data).map(ShaderInfoResult::Disassembly)
}
#[cfg(feature = "debug")]
x => unimplemented!("ShaderInfoTypeAMD {:?}", x),
#[cfg(not(feature = "debug"))]
x => unimplemented!("ShaderInfoTypeAMD {}", x.0),
}
})
}
}

#[derive(Clone)]
#[cfg_attr(feature = "debug", derive(Debug))]
pub enum ShaderInfoResult {
StatisticsInfo(vk::ShaderStatisticsInfoAMD),
Binary(Vec<u8>),
Disassembly(Vec<u8>),
/// <https://registry.khronos.org/vulkan/specs/1.3-extensions/man/html/vkGetShaderInfoAMD.html> with [`vk::ShaderInfoTypeAMD::DISASSEMBLY`]
#[inline]
pub unsafe fn get_shader_info_disassembly(
&self,
pipeline: vk::Pipeline,
shader_stage: vk::ShaderStageFlags,
) -> VkResult<Vec<u8>> {
read_into_uninitialized_vector(|count, data: *mut u8| {
(self.fp.get_shader_info_amd)(
self.handle,
pipeline,
shader_stage,
vk::ShaderInfoTypeAMD::DISASSEMBLY,
count,
data.cast(),
)
})
}
}