5 files changed, 20 insertions, 25 deletions

diff --git a/wgpu/src/backend.rs b/wgpu/src/backend.rs
index d09b2dba..6b847aff 100644
--- a/wgpu/src/backend.rs
+++ b/wgpu/src/backend.rs
@@ -354,10 +354,10 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: core::text::Shaping,
     ) -> (f32, f32) {
         self.text_pipeline
-            .measure(contents, size, font, bounds, advanced_shape)
+            .measure(contents, size, font, bounds, shaping)
     }
 
     fn hit_test(
@@ -366,18 +366,18 @@ impl backend::Text for Backend {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: core::text::Shaping,
         point: Point,
         nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<core::text::Hit> {
         self.text_pipeline.hit_test(
             contents,
             size,
             font,
             bounds,
+            shaping,
             point,
             nearest_only,
-            advanced_shape,
         )
     }
 
diff --git a/wgpu/src/geometry.rs b/wgpu/src/geometry.rs
index a85875a4..f6397ab7 100644
--- a/wgpu/src/geometry.rs
+++ b/wgpu/src/geometry.rs
@@ -334,7 +334,7 @@ impl Frame {
             font: text.font,
             horizontal_alignment: text.horizontal_alignment,
             vertical_alignment: text.vertical_alignment,
-            advanced_shape: text.advanced_shape,
+            shaping: text.shaping,
         });
     }
 
diff --git a/wgpu/src/layer.rs b/wgpu/src/layer.rs
index 7c5b43a3..b9fd044e 100644
--- a/wgpu/src/layer.rs
+++ b/wgpu/src/layer.rs
@@ -10,6 +10,7 @@ pub use mesh::Mesh;
 pub use quad::Quad;
 pub use text::Text;
 
+use crate::core;
 use crate::core::alignment;
 use crate::core::{Background, Color, Font, Point, Rectangle, Size, Vector};
 use crate::graphics::{Primitive, Viewport};
@@ -64,7 +65,7 @@ impl<'a> Layer<'a> {
                 font: Font::MONOSPACE,
                 horizontal_alignment: alignment::Horizontal::Left,
                 vertical_alignment: alignment::Vertical::Top,
-                advanced_shape: false,
+                shaping: core::text::Shaping::Basic,
             };
 
             overlay.text.push(text);
@@ -117,7 +118,7 @@ impl<'a> Layer<'a> {
                 font,
                 horizontal_alignment,
                 vertical_alignment,
-                advanced_shape,
+                shaping,
             } => {
                 let layer = &mut layers[current_layer];
 
@@ -129,7 +130,7 @@ impl<'a> Layer<'a> {
                     font: *font,
                     horizontal_alignment: *horizontal_alignment,
                     vertical_alignment: *vertical_alignment,
-                    advanced_shape: *advanced_shape,
+                    shaping: *shaping,
                 });
             }
             Primitive::Quad {
diff --git a/wgpu/src/layer/text.rs b/wgpu/src/layer/text.rs
index d36ff273..665f7188 100644
--- a/wgpu/src/layer/text.rs
+++ b/wgpu/src/layer/text.rs
@@ -1,4 +1,5 @@
 use crate::core::alignment;
+use crate::core::text;
 use crate::core::{Color, Font, Rectangle};
 
 /// A paragraph of text.
@@ -25,13 +26,6 @@ pub struct Text<'a> {
     /// The vertical alignment of the [`Text`].
     pub vertical_alignment: alignment::Vertical,
 
-    /// Whether the text needs advanced shaping and font fallback.
-    ///
-    /// You will need to enable this flag if the text contains a complex
-    /// script, the font used needs it, and/or multiple fonts in your system
-    /// may be needed to display all of the glyphs.
-    ///
-    /// Advanced shaping is expensive! You should only enable it when
-    /// necessary.
-    pub advanced_shape: bool,
+    /// The shaping strategy of the text.
+    pub shaping: text::Shaping,
 }
diff --git a/wgpu/src/text.rs b/wgpu/src/text.rs
index f433a5b6..fc126125 100644
--- a/wgpu/src/text.rs
+++ b/wgpu/src/text.rs
@@ -1,6 +1,6 @@
 use crate::core::alignment;
 use crate::core::font::{self, Font};
-use crate::core::text::Hit;
+use crate::core::text::{Hit, Shaping};
 use crate::core::{Point, Rectangle, Size};
 use crate::layer::Text;
 
@@ -83,7 +83,7 @@ impl Pipeline {
                             height: (section.bounds.height * scale_factor)
                                 .ceil(),
                         },
-                        advanced_shape: section.advanced_shape,
+                        shaping: section.shaping,
                     },
                 );
 
@@ -214,7 +214,7 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
-        advanced_shape: bool,
+        shaping: Shaping,
     ) -> (f32, f32) {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -225,7 +225,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
-                advanced_shape,
+                shaping,
             },
         );
 
@@ -245,9 +245,9 @@ impl Pipeline {
         size: f32,
         font: Font,
         bounds: Size,
+        shaping: Shaping,
         point: Point,
         _nearest_only: bool,
-        advanced_shape: bool,
     ) -> Option<Hit> {
         let mut measurement_cache = self.measurement_cache.borrow_mut();
 
@@ -258,7 +258,7 @@ impl Pipeline {
                 size,
                 font,
                 bounds,
-                advanced_shape,
+                shaping,
             },
         );
 
@@ -369,7 +369,7 @@ impl Cache {
                     .family(to_family(key.font.family))
                     .weight(to_weight(key.font.weight))
                     .stretch(to_stretch(key.font.stretch)),
-                !key.advanced_shape,
+                matches!(key.shaping, Shaping::Basic),
             );
 
             let _ = entry.insert(buffer);
@@ -394,7 +394,7 @@ struct Key<'a> {
     size: f32,
     font: Font,
     bounds: Size,
-    advanced_shape: bool,
+    shaping: Shaping,
 }
 
 type KeyHash = u64;