Revert "gpui & ui: Use shader for dashed dividers" (zed-industries#23850)

Reverts zed-industries#23839

getting some reports of linux crashes – will investigate later today

Release Notes:

- N/A

Author: iamnbutler

.zed/settings.json

@@ -39,7 +39,6 @@
     }
   },
   "file_types": {
-    "C": ["metal"],
     "Dockerfile": ["Dockerfile*[!dockerignore]"],
     "Git Ignore": ["dockerignore"]
   },

crates/gpui/examples/pattern.rs

@@ -1,7 +1,6 @@
 use gpui::{
-    div, linear_color_stop, linear_gradient, pattern_horizontal_dash, pattern_slash,
-    pattern_vertical_dash, prelude::*, px, rgb, size, App, AppContext, Application, Bounds,
-    Context, Window, WindowBounds, WindowOptions,
+    div, linear_color_stop, linear_gradient, pattern_slash, prelude::*, px, rgb, size, App,
+    AppContext, Application, Bounds, Context, Window, WindowBounds, WindowOptions,
 };
 
 struct PatternExample;
@@ -20,58 +19,6 @@ impl Render for PatternExample {
             .text_xl()
             .text_color(rgb(0x000000))
             .child("Pattern Example")
-            .child(
-                div()
-                    .flex()
-                    .gap_4()
-                    .child(
-                        div()
-                            .flex()
-                            .flex_col()
-                            .gap_1()
-                            .child(
-                                div()
-                                    .w(px(160.0))
-                                    .h(px(1.0))
-                                    .bg(pattern_horizontal_dash(gpui::red())),
-                            )
-                            .child(
-                                div()
-                                    .w(px(160.0))
-                                    .h(px(4.0))
-                                    .bg(pattern_horizontal_dash(gpui::red())),
-                            )
-                            .child(
-                                div()
-                                    .w(px(160.0))
-                                    .h(px(8.0))
-                                    .bg(pattern_horizontal_dash(gpui::red())),
-                            ),
-                    )
-                    .child(
-                        div()
-                            .flex()
-                            .gap_1()
-                            .child(
-                                div()
-                                    .w(px(1.0))
-                                    .h(px(160.0))
-                                    .bg(pattern_vertical_dash(gpui::blue())),
-                            )
-                            .child(
-                                div()
-                                    .w(px(4.0))
-                                    .h(px(160.0))
-                                    .bg(pattern_vertical_dash(gpui::blue())),
-                            )
-                            .child(
-                                div()
-                                    .w(px(8.0))
-                                    .h(px(160.0))
-                                    .bg(pattern_vertical_dash(gpui::blue())),
-                            ),
-                    ),
-            )
             .child(
                 div()
                     .flex()

crates/gpui/src/color.rs

@@ -548,33 +548,12 @@ impl<'de> Deserialize<'de> for Hsla {
     }
 }
 
-/// The orientation of a background.
-#[derive(Default, Debug, Clone, Copy, PartialEq, Eq)]
-#[repr(C)]
-pub enum BackgroundOrientation {
-    /// The background is oriented horizontally.
-    #[default]
-    Horizontal = 0,
-    /// The background is oriented vertically.
-    Vertical = 1,
-}
-
-impl Display for BackgroundOrientation {
-    fn fmt(&self, f: &mut Formatter<'_>) -> fmt::Result {
-        match self {
-            BackgroundOrientation::Horizontal => write!(f, "Horizontal"),
-            BackgroundOrientation::Vertical => write!(f, "Vertical"),
-        }
-    }
-}
-
 #[derive(Debug, Clone, Copy, PartialEq)]
 #[repr(C)]
 pub(crate) enum BackgroundTag {
     Solid = 0,
     LinearGradient = 1,
     PatternSlash = 2,
-    PatternDash = 3,
 }
 
 /// A color space for color interpolation.
@@ -610,7 +589,6 @@ pub struct Background {
     pub(crate) solid: Hsla,
     pub(crate) angle: f32,
     pub(crate) colors: [LinearColorStop; 2],
-    pub(crate) orientation: BackgroundOrientation,
     /// Padding for alignment for repr(C) layout.
     pad: u32,
 }
@@ -624,7 +602,6 @@ impl Default for Background {
             color_space: ColorSpace::default(),
             angle: 0.0,
             colors: [LinearColorStop::default(), LinearColorStop::default()],
-            orientation: BackgroundOrientation::default(),
             pad: 0,
         }
     }
@@ -639,26 +616,6 @@ pub fn pattern_slash(color: Hsla) -> Background {
     }
 }
 
-/// Creates a dash pattern background
-pub fn pattern_horizontal_dash(color: Hsla) -> Background {
-    Background {
-        tag: BackgroundTag::PatternDash,
-        orientation: BackgroundOrientation::Horizontal,
-        solid: color,
-        ..Default::default()
-    }
-}
-
-/// Creates a vertical dash pattern background
-pub fn pattern_vertical_dash(color: Hsla) -> Background {
-    Background {
-        tag: BackgroundTag::PatternDash,
-        solid: color,
-        orientation: BackgroundOrientation::Vertical,
-        ..Default::default()
-    }
-}
-
 /// Creates a LinearGradient background color.
 ///
 /// The gradient line's angle of direction. A value of `0.` is equivalent to to top; increasing values rotate clockwise from there.
@@ -737,7 +694,6 @@ impl Background {
             BackgroundTag::Solid => self.solid.is_transparent(),
             BackgroundTag::LinearGradient => self.colors.iter().all(|c| c.color.is_transparent()),
             BackgroundTag::PatternSlash => self.solid.is_transparent(),
-            BackgroundTag::PatternDash => self.solid.is_transparent(),
         }
     }
 }

crates/gpui/src/platform/blade/shaders.wgsl

@@ -359,7 +359,6 @@ fn gradient_color(background: Background, position: vec2<f32>, bounds: Bounds,
             }
         }
         case 2u: {
-            // Slash pattern
             let base_pattern_size = bounds.size.y / 5.0;
             let width = base_pattern_size * 0.5;
             let slash_spacing = 0.89;
@@ -375,21 +374,6 @@ fn gradient_color(background: Background, position: vec2<f32>, bounds: Bounds,
             background_color = sold_color;
             background_color.a *= saturate(0.5 - distance);
         }
-        case 3u: {
-            // Dash pattern
-            let dash_width = 8.0;
-            let gap_width = 8.0;
-            let pattern_width = dash_width + gap_width;
-            let relative_position = position - bounds.origin;
-
-            // Use a dot product to select x or y based on orientation
-            let orientation_vector = vec2<f32>(1.0 - f32(background.angle != 0.0), f32(background.angle != 0.0));
-            let pattern_position = fmod(dot(relative_position, orientation_vector), pattern_width);
-
-            let distance = pattern_position - dash_width;
-            background_color = sold_color;
-            background_color.a *= step(-distance, 0.0);
-        }
     }
 
     return background_color;

crates/gpui/src/platform/mac/shaders.metal

@@ -797,7 +797,7 @@ float4 over(float4 below, float4 above) {
 GradientColor prepare_fill_color(uint tag, uint color_space, Hsla solid,
                                      Hsla color0, Hsla color1) {
   GradientColor out;
-  if (tag == 0 || tag == 2 || tag == 3) {
+  if (tag == 0 || tag == 2) {
     out.solid = hsla_to_rgba(solid);
   } else if (tag == 1) {
     out.color0 = hsla_to_rgba(color0);
@@ -874,10 +874,13 @@ float4 fill_color(Background background,
       break;
     }
     case 2: {
-        // Slash pattern
+        // This pattern is full of magic numbers to make it line up perfectly
+        // when vertically stacked. Make sure you know what you are doing
+        // if you change this!
+
         float base_pattern_size = bounds.size.height / 5;
         float width = base_pattern_size * 0.5;
-        float slash_spacing = .89; // exact number to make vertical elements line up
+        float slash_spacing = .89;
         float radians = M_PI_F / 4.0;
         float2x2 rotation = rotate2d(radians);
         float2 relative_position = position - float2(bounds.origin.x, bounds.origin.y);
@@ -888,22 +891,6 @@ float4 fill_color(Background background,
         color.a *= saturate(0.5 - distance);
         break;
     }
-    case 3: {
-        // Dash pattern
-        float dash_width = 8.0;
-        float gap_width = 8.0;
-        float pattern_width = dash_width + gap_width;
-        float2 relative_position = position - float2(bounds.origin.x, bounds.origin.y);
-
-        // Use a dot product to select x or y based on orientation
-        float2 orientation_vector = float2(1.0 - background.orientation, background.orientation);
-        float pattern_position = fmod(dot(relative_position, orientation_vector), pattern_width);
-
-        float distance = pattern_position - dash_width;
-        color = solid_color;
-        color.a *= step(-distance, 0.0);
-        break;
-    }
   }
 
   return color;

crates/gpui/src/style.rs

@@ -583,7 +583,6 @@ impl Style {
                         .map(|stop| stop.color)
                         .unwrap_or_default(),
                     BackgroundTag::PatternSlash => color.solid,
-                    BackgroundTag::PatternDash => color.solid,
                 },
                 None => Hsla::default(),
             };