1 files changed, 21 insertions, 18 deletions

diff --git a/engine/src/renderer/opengl.rs b/engine/src/renderer/opengl.rs
index e7a630b..c036cc0 100644
--- a/engine/src/renderer/opengl.rs
+++ b/engine/src/renderer/opengl.rs
@@ -24,8 +24,15 @@ use crate::material::{Flags as MaterialFlags, Material};
 use crate::matrix::Matrix;
 use crate::mesh::Mesh;
 use crate::opengl::buffer::{Buffer, Usage as BufferUsage};
-#[cfg(feature = "debug")]
-use crate::opengl::debug::{MessageSeverity, MessageSource, MessageType};
+use crate::opengl::debug::{
+    enable_debug_output,
+    set_debug_message_callback,
+    set_debug_message_control,
+    MessageIdsAction,
+    MessageSeverity,
+    MessageSource,
+    MessageType,
+};
 use crate::opengl::glsl::{
     preprocess as glsl_preprocess,
     PreprocessingError as GlslPreprocessingError,
@@ -46,7 +53,14 @@ use crate::opengl::vertex_array::{
     PrimitiveKind,
     VertexArray,
 };
-use crate::opengl::{clear_buffers, enable, BufferClearMask, Capability};
+use crate::opengl::{
+    clear_buffers,
+    enable,
+    get_context_flags as get_opengl_context_flags,
+    BufferClearMask,
+    Capability,
+    ContextFlags,
+};
 use crate::projection::{new_perspective_matrix, Projection};
 use crate::texture::{Id as TextureId, Texture};
 use crate::transform::{Position, Scale};
@@ -101,8 +115,9 @@ fn initialize(window: Single<Window>)
         }
     });
 
-    #[cfg(feature = "debug")]
-    initialize_debug();
+    if get_opengl_context_flags().contains(ContextFlags::DEBUG) {
+        initialize_debug();
+    }
 
     let window_size = window.size().expect("Failed to get window size");
 
@@ -129,7 +144,6 @@ fn render(
 )
 {
     let Some((camera, camera_pos, _)) = camera_query.iter().next() else {
-        #[cfg(feature = "debug")]
         tracing::warn!("No current camera. Nothing will be rendered");
         return;
     };
@@ -249,20 +263,11 @@ fn set_viewport(position: Vec2<u32>, size: Dimens<u32>)
     crate::opengl::set_viewport(position, size);
 }
 
-#[cfg(feature = "debug")]
 fn initialize_debug()
 {
-    use crate::opengl::debug::{
-        enable_debug_output,
-        set_debug_message_callback,
-        set_debug_message_control,
-        MessageIdsAction,
-    };
-
     enable_debug_output();
 
     set_debug_message_callback(opengl_debug_message_cb);
-
     set_debug_message_control(None, None, None, &[], MessageIdsAction::Disable);
 }
 
@@ -367,10 +372,9 @@ struct GlObjects
 
 impl GlObjects
 {
-    #[cfg_attr(feature = "debug", tracing::instrument(skip_all))]
+    #[tracing::instrument(skip_all)]
     fn new(mesh: &Mesh) -> Self
     {
-        #[cfg(feature = "debug")]
         tracing::trace!(
             "Creating vertex array, vertex buffer{}",
             if mesh.indices().is_some() {
@@ -692,7 +696,6 @@ fn create_view(camera: &Camera, camera_pos: &Position) -> Matrix<f32, 4, 4>
     view
 }
 
-#[cfg(feature = "debug")]
 #[tracing::instrument(skip_all)]
 fn opengl_debug_message_cb(
     source: MessageSource,