From 6469e463cd1f99190c6eba4701d4c1059934d3ee Mon Sep 17 00:00:00 2001
From: Yusuf Bera Ertan <y.bera003.06@protonmail.com>
Date: Mon, 14 Jun 2021 18:06:28 +0300
Subject: feat: expose draw_cache_multithread

---
 wgpu/src/text.rs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'wgpu/src')

diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index 4d92d9e9..eed5de38 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -46,7 +46,9 @@ impl Pipeline {
         let draw_brush =
             wgpu_glyph::GlyphBrushBuilder::using_font(font.clone())
                 .initial_cache_size((2048, 2048))
-                .draw_cache_multithread(false) // TODO: Expose as a configuration flag
+                .draw_cache_multithread(cfg!(
+                    feature = "glyph_draw_cache_multithread"
+                ))
                 .build(device, format);
 
         let measure_brush =
-- 
cgit 


From 217f5be8272f48a5b043d066ed1788cc127e1164 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 22 Jul 2021 18:21:50 +0700
Subject: Add `text_multithreading` to `Settings` in `iced_glow` and
 `iced_wgpu`

---
 wgpu/src/backend.rs  | 9 +++++++--
 wgpu/src/settings.rs | 5 +++++
 wgpu/src/text.rs     | 5 ++---
 3 files changed, 14 insertions(+), 5 deletions(-)

(limited to 'wgpu/src')

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index 534c6cb7..783079f3 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -31,8 +31,13 @@ pub struct Backend {
 impl Backend {
     /// Creates a new [`Backend`].
     pub fn new(device: &wgpu::Device, settings: Settings) -> Self {
-        let text_pipeline =
-            text::Pipeline::new(device, settings.format, settings.default_font);
+        let text_pipeline = text::Pipeline::new(
+            device,
+            settings.format,
+            settings.default_font,
+            settings.text_multithreading,
+        );
+
         let quad_pipeline = quad::Pipeline::new(device, settings.format);
         let triangle_pipeline = triangle::Pipeline::new(
             device,
diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index 6c97d895..b490e54e 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -29,6 +29,10 @@ pub struct Settings {
     /// By default, it will be set to 20.
     pub default_text_size: u16,
 
+    /// If enabled, spread text workload in multiple threads when multiple cores
+    /// are available.
+    pub text_multithreading: bool,
+
     /// The antialiasing strategy that will be used for triangle primitives.
     pub antialiasing: Option<Antialiasing>,
 }
@@ -65,6 +69,7 @@ impl Default for Settings {
             internal_backend: wgpu::BackendBit::PRIMARY,
             default_font: None,
             default_text_size: 20,
+            text_multithreading: false,
             antialiasing: None,
         }
     }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index eed5de38..2b5b94c9 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -15,6 +15,7 @@ impl Pipeline {
         device: &wgpu::Device,
         format: wgpu::TextureFormat,
         default_font: Option<&[u8]>,
+        multithreading: bool,
     ) -> Self {
         let default_font = default_font.map(|slice| slice.to_vec());
 
@@ -46,9 +47,7 @@ impl Pipeline {
         let draw_brush =
             wgpu_glyph::GlyphBrushBuilder::using_font(font.clone())
                 .initial_cache_size((2048, 2048))
-                .draw_cache_multithread(cfg!(
-                    feature = "glyph_draw_cache_multithread"
-                ))
+                .draw_cache_multithread(multithreading)
                 .build(device, format);
 
         let measure_brush =
-- 
cgit 


From 357a8a95c9820651110fe4d80d8d33a2678827c0 Mon Sep 17 00:00:00 2001
From: Héctor Ramón Jiménez <hector0193@gmail.com>
Date: Thu, 22 Jul 2021 18:27:33 +0700
Subject: Introduce `text_multithreading` to `Settings`

---
 wgpu/src/settings.rs | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'wgpu/src')

diff --git a/wgpu/src/settings.rs b/wgpu/src/settings.rs
index b490e54e..9a7eed34 100644
--- a/wgpu/src/settings.rs
+++ b/wgpu/src/settings.rs
@@ -31,9 +31,13 @@ pub struct Settings {
 
     /// If enabled, spread text workload in multiple threads when multiple cores
     /// are available.
+    ///
+    /// By default, it is disabled.
     pub text_multithreading: bool,
 
     /// The antialiasing strategy that will be used for triangle primitives.
+    ///
+    /// By default, it is `None`.
     pub antialiasing: Option<Antialiasing>,
 }
 
-- 
cgit