New signature for pipeline creation

This commit is contained in:
Maik Klein 2017-04-07 09:59:56 +02:00
parent 495c617513
commit f4c991b821

View file

@ -425,7 +425,7 @@ pub trait DeviceV1_0 {
pipeline_cache: vk::PipelineCache, pipeline_cache: vk::PipelineCache,
create_infos: &[vk::GraphicsPipelineCreateInfo], create_infos: &[vk::GraphicsPipelineCreateInfo],
allocation_callbacks: Option<&vk::AllocationCallbacks>) allocation_callbacks: Option<&vk::AllocationCallbacks>)
-> (Vec<vk::Pipeline>, VkResult<()>) { -> Result<Vec<vk::Pipeline>, (Vec<vk::Pipeline>, vk::Result)>{
let mut pipelines = Vec::with_capacity(create_infos.len()); let mut pipelines = Vec::with_capacity(create_infos.len());
let err_code = self.fp_v1_0() let err_code = self.fp_v1_0()
.create_graphics_pipelines(self.handle(), .create_graphics_pipelines(self.handle(),
@ -436,8 +436,8 @@ pub trait DeviceV1_0 {
pipelines.as_mut_ptr()); pipelines.as_mut_ptr());
pipelines.set_len(create_infos.len()); pipelines.set_len(create_infos.len());
match err_code { match err_code {
vk::Result::Success => (pipelines, Ok(())), vk::Result::Success => Ok(pipelines),
_ => (pipelines, Err(err_code)), _ => Err((pipelines,err_code)),
} }
} }