From 3645d34d6a1ba1247238e830e9eefd52d9e5b986 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Thu, 21 Mar 2024 22:27:17 +0100
Subject: Implement composable, type-safe renderer fallback

---
 winit/src/multi_window.rs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

(limited to 'winit/src/multi_window.rs')

diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
index 18db1fb5..c865b0ee 100644
--- a/winit/src/multi_window.rs
+++ b/winit/src/multi_window.rs
@@ -105,7 +105,7 @@ where
 /// settings.
 pub fn run<A, E, C>(
     settings: Settings<A::Flags>,
-    compositor_settings: C::Settings,
+    compositor_settings: impl Into<C::Settings>,
 ) -> Result<(), Error>
 where
     A: Application + 'static,
@@ -186,8 +186,10 @@ where
         };
     }
 
-    let mut compositor =
-        executor::block_on(C::new(compositor_settings, main_window.clone()))?;
+    let mut compositor = executor::block_on(C::new(
+        compositor_settings.into(),
+        main_window.clone(),
+    ))?;
 
     let mut window_manager = WindowManager::new();
     let _ = window_manager.insert(
-- 
cgit 


From 5137d655e6bbd29581fc1469d0385515113f2999 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector@hecrj.dev>
Date: Fri, 22 Mar 2024 07:09:51 +0100
Subject: Allow custom renderers in `Program` and `Application`

---
 winit/src/multi_window.rs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'winit/src/multi_window.rs')

diff --git a/winit/src/multi_window.rs b/winit/src/multi_window.rs
index c865b0ee..b4c25411 100644
--- a/winit/src/multi_window.rs
+++ b/winit/src/multi_window.rs
@@ -16,6 +16,7 @@ use crate::futures::futures::executor;
 use crate::futures::futures::task;
 use crate::futures::futures::{Future, StreamExt};
 use crate::futures::{Executor, Runtime, Subscription};
+use crate::graphics;
 use crate::graphics::{compositor, Compositor};
 use crate::multi_window::window_manager::WindowManager;
 use crate::runtime::command::{self, Command};
@@ -105,7 +106,7 @@ where
 /// settings.
 pub fn run<A, E, C>(
     settings: Settings<A::Flags>,
-    compositor_settings: impl Into<C::Settings>,
+    graphics_settings: graphics::Settings,
 ) -> Result<(), Error>
 where
     A: Application + 'static,
@@ -186,10 +187,8 @@ where
         };
     }
 
-    let mut compositor = executor::block_on(C::new(
-        compositor_settings.into(),
-        main_window.clone(),
-    ))?;
+    let mut compositor =
+        executor::block_on(C::new(graphics_settings, main_window.clone()))?;
 
     let mut window_manager = WindowManager::new();
     let _ = window_manager.insert(
-- 
cgit