@@ -537,15 +537,6 @@ struct SwapChain {
537
537
present_mode : wgt:: PresentMode ,
538
538
format : wgt:: TextureFormat ,
539
539
size : wgt:: Extent3d ,
540
- options : wgt:: Dx12BackendOptions ,
541
- }
542
-
543
- impl SwapChain {
544
- /// Returns the waitable handle associated with this swap chain, if any.
545
- /// Handle is only valid while the swap chain is alive.
546
- pub unsafe fn waitable_handle ( & self ) -> Option < Foundation :: HANDLE > {
547
- self . waitable
548
- }
549
540
}
550
541
551
542
enum SurfaceTarget {
@@ -574,13 +565,10 @@ impl Surface {
574
565
Some ( self . swap_chain . read ( ) . as_ref ( ) ?. raw . clone ( ) )
575
566
}
576
567
577
- /// Returns the waitable handle of the swapchain, if it exists.
568
+ /// Returns the waitable handle associated with this swap chain, if any.
569
+ /// Handle is only valid while the swap chain is alive.
578
570
pub unsafe fn waitable_handle ( & self ) -> Option < Foundation :: HANDLE > {
579
- let swapchain = self . swap_chain . read ( ) ;
580
- if let Some ( swap_chain) = swapchain. as_ref ( ) {
581
- return swap_chain. waitable . clone ( ) ;
582
- }
583
- None
571
+ self . swap_chain . read ( ) . as_ref ( ) ?. waitable
584
572
}
585
573
}
586
574
@@ -1424,7 +1412,6 @@ impl crate::Surface for Surface {
1424
1412
present_mode : config. present_mode ,
1425
1413
format : config. format ,
1426
1414
size : config. extent ,
1427
- options : device. options . clone ( ) ,
1428
1415
} ) ;
1429
1416
1430
1417
Ok ( ( ) )
0 commit comments