work around rust-analyzer derp

robbert-vdh · Dec 14, 2024 · 78ca9bb · 78ca9bb
1 parent 7f06398
commit 78ca9bb
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 2 deletions.
diff --git a/plugins/examples/byo_gui_softbuffer/Cargo.toml b/plugins/examples/byo_gui_softbuffer/Cargo.toml
@@ -13,7 +13,9 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 nih_plug = { path = "../../../", features = ["assert_process_allocs", "standalone"] }
-baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "9a0b42c09d712777b2edb4c5e0cb6baf21e988f0" }
+# NOTE: OpenGL support is not needed here, but rust-analyzer gets confused when
+#       some crates do use it and others don't
+baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "9a0b42c09d712777b2edb4c5e0cb6baf21e988f0", features = ["opengl"]}
 softbuffer = { version = "0.4.6", default-features = false, features = ["kms", "x11"]}
 raw-window-handle = "0.5"
 raw-window-handle-06 = { package = "raw-window-handle", version = "0.6" }

diff --git a/plugins/examples/byo_gui_softbuffer/src/lib.rs b/plugins/examples/byo_gui_softbuffer/src/lib.rs
@@ -202,6 +202,10 @@ impl Editor for CustomSoftbufferEditor {
                 scale: scaling_factor
                     .map(|factor| WindowScalePolicy::ScaleFactor(factor as f64))
                     .unwrap_or(WindowScalePolicy::SystemScaleFactor),
+
+                // NOTE: The OpenGL feature in baseview is not needed here, but rust-analyzer gets
+                // confused when some crates do use it and others don't.
+                gl_config: None,
             },
             move |window: &mut baseview::Window<'_>| -> CustomSoftbufferWindow {
                 CustomSoftbufferWindow::new(

diff --git a/plugins/examples/byo_gui_wgpu/Cargo.toml b/plugins/examples/byo_gui_wgpu/Cargo.toml
@@ -13,7 +13,9 @@ crate-type = ["cdylib", "lib"]
 
 [dependencies]
 nih_plug = { path = "../../../", features = ["assert_process_allocs", "standalone"] }
-baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "9a0b42c09d712777b2edb4c5e0cb6baf21e988f0" }
+# NOTE: OpenGL support is not needed here, but rust-analyzer gets confused when
+#       some crates do use it and others don't
+baseview = { git = "https://github.com/RustAudio/baseview.git", rev = "9a0b42c09d712777b2edb4c5e0cb6baf21e988f0", features = ["opengl"]}
 wgpu = "23"
 raw-window-handle = "0.5"
 raw-window-handle-06 = { package = "raw-window-handle", version = "0.6" }

diff --git a/plugins/examples/byo_gui_wgpu/src/lib.rs b/plugins/examples/byo_gui_wgpu/src/lib.rs
@@ -321,6 +321,10 @@ impl Editor for CustomWgpuEditor {
                 scale: scaling_factor
                     .map(|factor| WindowScalePolicy::ScaleFactor(factor as f64))
                     .unwrap_or(WindowScalePolicy::SystemScaleFactor),
+
+                // NOTE: The OpenGL feature in baseview is not needed here, but rust-analyzer gets
+                // confused when some crates do use it and others don't.
+                gl_config: None,
             },
             move |window: &mut baseview::Window<'_>| -> CustomWgpuWindow {
                 CustomWgpuWindow::new(