proper modules on renderer

frontend-common/src/window/winit_manager.rs

@@ -8,10 +8,11 @@ use std::{
 };
 
 use cpal::Stream;
-use gb_emu_lib::{
+use gb_emu_lib::connect::{EmulatorMessage, JoypadState, RendererMessage, ResolutionData};
-    connect::{EmulatorMessage, JoypadState, RendererMessage, ResolutionData},
+#[cfg(feature = "pixels")]
-    renderer::{RendererBackend, RendererBackendManager, WindowOptions},
+use gb_emu_lib::renderer::pixels::{RendererBackend, RendererBackendManager, WindowOptions};
-};
+#[cfg(feature = "vulkan")]
+use gb_emu_lib::renderer::vulkan::{RendererBackend, RendererBackendManager, WindowOptions};
 use gilrs::{Button, Gilrs};
 use image::ImageBuffer;
 #[cfg(feature = "vulkan")]

gb-vst/src/plugin/ui.rs

@@ -3,10 +3,13 @@ use std::sync::{Arc, Mutex};
 use baseview::{
     Event, EventStatus, Size, Window, WindowEvent, WindowHandle, WindowHandler, WindowOpenOptions,
 };
-use gb_emu_lib::{
+use gb_emu_lib::connect::{
-    connect::{JoypadButtons, JoypadState, RendererMessage, ResolutionData, HEIGHT, WIDTH},
+    JoypadButtons, JoypadState, RendererMessage, ResolutionData, HEIGHT, WIDTH,
-    renderer::{RendererBackend, RendererBackendManager, WindowOptions},
 };
+#[cfg(feature = "pixels")]
+use gb_emu_lib::renderer::pixels::{RendererBackend, RendererBackendManager, WindowOptions};
+#[cfg(feature = "vulkan")]
+use gb_emu_lib::renderer::vulkan::{RendererBackend, RendererBackendManager, WindowOptions};
 use keyboard_types::{Code, KeyState};
 use nih_plug::prelude::*;
 

gui/src/macos/cacao_window_manager.rs

@@ -24,7 +24,7 @@ use frontend_common::{
 };
 use gb_emu_lib::{
     connect::{EmulatorMessage, JoypadButtons, JoypadState, RendererMessage, ResolutionData},
-    renderer::{RendererBackend, RendererBackendManager, WindowOptions},
+    renderer::vulkan::{RendererBackend, RendererBackendManager, WindowOptions},
 };
 use objc::{
     class, msg_send, msg_send_id,

lib/src/lib.rs

@@ -11,10 +11,6 @@ use std::sync::mpsc::Receiver;
 #[cfg(all(feature = "vulkan", feature = "pixels"))]
 compile_error!("select only one rendering backend!");
 
-#[allow(unused_attributes)]
-#[cfg(any(feature = "vulkan-renderer", feature = "pixels-renderer"))]
-#[cfg_attr(feature = "pixels-renderer", path = "renderer/pixels.rs")]
-#[cfg_attr(feature = "vulkan-renderer", path = "renderer/vulkan/vulkan.rs")]
 pub mod renderer;
 
 #[cfg(feature = "config")]

lib/src/renderer/mod.rs

@@ -0,0 +1,4 @@
+#[cfg(feature = "pixels-renderer")]
+pub mod pixels;
+#[cfg(feature = "vulkan-renderer")]
+pub mod vulkan;