File tree Expand file tree Collapse file tree 4 files changed +6
-3
lines changed
engine/modules/render_vulkan/src Expand file tree Collapse file tree 4 files changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -19,7 +19,8 @@ pub(crate) fn process_object(
1919) {
2020 let ( instance, device, state) = state_tuple;
2121
22- let mut object = get_render_context_2d ( ) . get_object_mut ( object_handle) . unwrap ( ) ;
22+ let mut object = get_render_context_2d ( ) . get_object_mut ( object_handle)
23+ . expect ( "Object not present in render context during processing" ) ;
2324
2425 let existing_obj = {
2526 let scene_state = state. scene_states_2d . entry ( scene_id. to_owned ( ) ) . or_insert_with ( || {
Original file line number Diff line number Diff line change @@ -62,7 +62,7 @@ impl VulkanDevice {
6262 let dev_features = vk:: PhysicalDeviceFeatures :: default ( )
6363 . independent_blend ( true ) ;
6464
65- let ext_names: Vec < * const i8 > = ENGINE_DEVICE_EXTENSIONS . iter ( )
65+ let ext_names: Vec < _ > = ENGINE_DEVICE_EXTENSIONS . iter ( )
6666 . map ( |ext| ext. as_ptr ( ) )
6767 . collect ( ) ;
6868
Original file line number Diff line number Diff line change @@ -34,7 +34,7 @@ impl VulkanInstance {
3434 . into_iter ( )
3535 . map ( |ext| CString :: new ( ext) . unwrap ( ) )
3636 . collect ( ) ;
37-
37+
3838 let required_exts_c: Vec < _ > = required_extensions. iter ( )
3939 . map ( |s| CString :: from ( * s) )
4040 . collect ( ) ;
Original file line number Diff line number Diff line change @@ -43,9 +43,11 @@ fn create_sampler_binding<'a>() -> vk::DescriptorSetLayoutBinding<'a> {
4343
4444pub ( crate ) fn create_descriptor_pool ( device : & VulkanDevice ) -> Result < vk:: DescriptorPool , String > {
4545 let ubo_pool_size = vk:: DescriptorPoolSize :: default ( )
46+ . ty ( vk:: DescriptorType :: UNIFORM_BUFFER )
4647 . descriptor_count ( INITIAL_UBO_COUNT ) ;
4748
4849 let sampler_pool_size = vk:: DescriptorPoolSize :: default ( )
50+ . ty ( vk:: DescriptorType :: COMBINED_IMAGE_SAMPLER )
4951 . descriptor_count ( INITIAL_SAMPLER_COUNT ) ;
5052
5153 let pool_sizes = [ ubo_pool_size, sampler_pool_size] ;
You can’t perform that action at this time.
0 commit comments