From 89700dfbbb125d8020e2200ccf2b3f2c577f20ef Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Sat, 13 Nov 2021 13:14:10 +0100
Subject: [PATCH] Improve egui_glow debug prints

---
 egui_glow/src/misc_util.rs      |  8 ++++----
 egui_glow/src/painter.rs        |  2 +-
 egui_glow/src/shader_version.rs | 11 ++++++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/egui_glow/src/misc_util.rs b/egui_glow/src/misc_util.rs
index 76b6a3be..6d527ed6 100644
--- a/egui_glow/src/misc_util.rs
+++ b/egui_glow/src/misc_util.rs
@@ -80,12 +80,12 @@ pub(crate) unsafe fn as_u8_slice<T>(s: &[T]) -> &[u8] {
 }
 
 #[cfg(target_arch = "wasm32")]
-pub(crate) fn glow_debug_print(s: impl Into<JsValue>) {
-    web_sys::console::log_1(&s.into());
+pub(crate) fn glow_debug_print(s: impl std::fmt::Display) {
+    web_sys::console::log_1(&format!("egui_glow: {}", s).into());
 }
 #[cfg(not(target_arch = "wasm32"))]
 pub(crate) fn glow_debug_print(s: impl std::fmt::Display) {
-    println!("{}", s);
+    eprintln!("egui_glow: {}", s);
 }
 
 pub(crate) unsafe fn compile_shader(
@@ -218,7 +218,7 @@ pub(crate) fn supports_vao(gl: &glow::Context) -> bool {
             true
         }
     } else {
-        glow_debug_print(format!("detected OpenGL:{}", version_string));
+        glow_debug_print(format!("detected OpenGL: {:?}", version_string));
         //from OpenGL 3 vao into core
         if version_string.starts_with('2') {
             // I found APPLE_vertex_array_object , GL_ATI_vertex_array_object ,ARB_vertex_array_object
diff --git a/egui_glow/src/painter.rs b/egui_glow/src/painter.rs
index 125cbd7e..550de486 100644
--- a/egui_glow/src/painter.rs
+++ b/egui_glow/src/painter.rs
@@ -79,7 +79,7 @@ impl Painter {
         let shader_version = ShaderVersion::get(gl);
         let is_webgl_1 = shader_version == ShaderVersion::Es100;
         let header = shader_version.version();
-        glow_debug_print(header);
+        glow_debug_print(format!("Shader header: {:?}", header));
         let srgb_support = gl.supported_extensions().contains("EXT_sRGB");
 
         let (post_process, srgb_support_define) = match (shader_version, srgb_support) {
diff --git a/egui_glow/src/shader_version.rs b/egui_glow/src/shader_version.rs
index 4e89d543..a3d69dc0 100644
--- a/egui_glow/src/shader_version.rs
+++ b/egui_glow/src/shader_version.rs
@@ -14,9 +14,14 @@ pub(crate) enum ShaderVersion {
 
 impl ShaderVersion {
     pub(crate) fn get(gl: &glow::Context) -> Self {
-        let shading_lang = unsafe { gl.get_parameter_string(glow::SHADING_LANGUAGE_VERSION) };
-        glow_debug_print(&shading_lang);
-        Self::parse(&shading_lang)
+        let shading_lang_string =
+            unsafe { gl.get_parameter_string(glow::SHADING_LANGUAGE_VERSION) };
+        let shader_version = Self::parse(&shading_lang_string);
+        glow_debug_print(format!(
+            "Shader version: {:?} ({:?})",
+            shader_version, shading_lang_string
+        ));
+        shader_version
     }
 
     #[inline]