File tree Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Expand file tree Collapse file tree 3 files changed +8
-8
lines changed Original file line number Diff line number Diff line change 1
1
use std:: default:: Default ;
2
- use std:: ffi:: CString ;
2
+ use std:: ffi:: CStr ;
3
3
use std:: io:: Cursor ;
4
4
use std:: mem:: { self , align_of} ;
5
5
use std:: os:: raw:: c_void;
@@ -573,7 +573,7 @@ fn main() {
573
573
. create_pipeline_layout ( & layout_create_info, None )
574
574
. unwrap ( ) ;
575
575
576
- let shader_entry_name = CString :: new ( "main" ) . unwrap ( ) ;
576
+ let shader_entry_name = CStr :: from_bytes_with_nul_unchecked ( b "main\0 " ) ;
577
577
let shader_stage_create_infos = [
578
578
vk:: PipelineShaderStageCreateInfo {
579
579
module : vertex_shader_module,
Original file line number Diff line number Diff line change @@ -2,7 +2,7 @@ use ash::util::*;
2
2
use ash:: vk;
3
3
use examples:: * ;
4
4
use std:: default:: Default ;
5
- use std:: ffi:: CString ;
5
+ use std:: ffi:: CStr ;
6
6
use std:: io:: Cursor ;
7
7
use std:: mem;
8
8
use std:: mem:: align_of;
@@ -226,7 +226,7 @@ fn main() {
226
226
. create_pipeline_layout ( & layout_create_info, None )
227
227
. unwrap ( ) ;
228
228
229
- let shader_entry_name = CString :: new ( "main" ) . unwrap ( ) ;
229
+ let shader_entry_name = CStr :: from_bytes_with_nul_unchecked ( b "main\0 " ) ;
230
230
let shader_stage_create_infos = [
231
231
vk:: PipelineShaderStageCreateInfo {
232
232
module : vertex_shader_module,
Original file line number Diff line number Diff line change @@ -11,7 +11,7 @@ pub use ash::{Device, Instance};
11
11
use std:: borrow:: Cow ;
12
12
use std:: cell:: RefCell ;
13
13
use std:: default:: Default ;
14
- use std:: ffi:: { CStr , CString } ;
14
+ use std:: ffi:: CStr ;
15
15
use std:: ops:: Drop ;
16
16
use std:: os:: raw:: c_char;
17
17
@@ -218,7 +218,7 @@ impl ExampleBase {
218
218
. build ( & event_loop)
219
219
. unwrap ( ) ;
220
220
let entry = Entry :: linked ( ) ;
221
- let app_name = CString :: new ( "VulkanTriangle" ) . unwrap ( ) ;
221
+ let app_name = CStr :: from_bytes_with_nul_unchecked ( b "VulkanTriangle\0 " ) ;
222
222
223
223
let layer_names = [ CStr :: from_bytes_with_nul_unchecked (
224
224
b"VK_LAYER_KHRONOS_validation\0 " ,
@@ -236,9 +236,9 @@ impl ExampleBase {
236
236
extension_names_raw. push ( DebugUtils :: name ( ) . as_ptr ( ) ) ;
237
237
238
238
let appinfo = vk:: ApplicationInfo :: builder ( )
239
- . application_name ( & app_name)
239
+ . application_name ( app_name)
240
240
. application_version ( 0 )
241
- . engine_name ( & app_name)
241
+ . engine_name ( app_name)
242
242
. engine_version ( 0 )
243
243
. api_version ( vk:: make_api_version ( 0 , 1 , 0 , 0 ) ) ;
244
244
You can’t perform that action at this time.
0 commit comments