From 48e5af6373ef960b5f58728485c4fbd2477fa1ca Mon Sep 17 00:00:00 2001
From: Lynix <lynix680@gmail.com>
Date: Tue, 30 Jul 2013 21:31:28 +0200
Subject: [PATCH] Added NazaraDebug macro

Former-commit-id: 5a8cec09bd4a7283f86d030ac2d867cda23736cd
---
 include/Nazara/Core/Log.hpp           | 6 ++++++
 src/Nazara/Renderer/OpenGL.cpp        | 6 +++++-
 src/Nazara/Renderer/ShaderManager.cpp | 7 ++-----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/include/Nazara/Core/Log.hpp b/include/Nazara/Core/Log.hpp
index 65d2169f2..0270829d3 100644
--- a/include/Nazara/Core/Log.hpp
+++ b/include/Nazara/Core/Log.hpp
@@ -18,6 +18,12 @@
 #include <Nazara/Core/ThreadSafetyOff.hpp>
 #endif
 
+#ifdef NAZARA_DEBUG
+#define NazaraDebug(txt) NazaraNotice(txt)
+#else
+#define NazaraDebug(txt)
+#endif
+
 #define NazaraLog NzLog::Instance()
 #define NazaraNotice(txt) NazaraLog->Write(txt)
 
diff --git a/src/Nazara/Renderer/OpenGL.cpp b/src/Nazara/Renderer/OpenGL.cpp
index 196117afa..d90c1e273 100644
--- a/src/Nazara/Renderer/OpenGL.cpp
+++ b/src/Nazara/Renderer/OpenGL.cpp
@@ -4,6 +4,7 @@
 
 #include <Nazara/Renderer/OpenGL.hpp>
 #include <Nazara/Core/Error.hpp>
+#include <Nazara/Core/Log.hpp>
 #include <Nazara/Math/Basic.hpp>
 #include <Nazara/Renderer/Context.hpp>
 #include <cstring>
@@ -549,9 +550,12 @@ bool NzOpenGL::Initialize()
 	}
 
 	s_openglVersion = major*100 + minor*10;
+
+	NazaraDebug("OpenGL " + NzString::Number(major) + '.' + NzString::Number(minor) + " detected");
+
 	if (s_openglVersion < 200)
 	{
-		NazaraError("OpenGL version is too low, please upgrade your drivers or your video card");
+		NazaraError("OpenGL " + NzString::Number(major) + '.' + NzString::Number(minor) + " detected (2.0 required). Please upgrade your drivers or your video card");
 		Uninitialize();
 
 		return false;
diff --git a/src/Nazara/Renderer/ShaderManager.cpp b/src/Nazara/Renderer/ShaderManager.cpp
index c35948ad3..598abe0a2 100644
--- a/src/Nazara/Renderer/ShaderManager.cpp
+++ b/src/Nazara/Renderer/ShaderManager.cpp
@@ -771,6 +771,7 @@ NzShader* NzShaderManager::GenerateShader(const NzShaderManagerParams& params)
 	}
 
 	NzString fragmentSource = BuildFragmentCode(params);
+	NazaraDebug("Fragment shader source:\n" + fragmentSource);
 	if (!shader->Load(nzShaderType_Fragment, fragmentSource))
 	{
 		NazaraError("Failed to load fragment shader: " + shader->GetLog());
@@ -779,6 +780,7 @@ NzShader* NzShaderManager::GenerateShader(const NzShaderManagerParams& params)
 	}
 
 	NzString vertexSource = BuildVertexCode(params);
+	NazaraDebug("Vertex shader source:\n" + vertexSource);
 	if (!shader->Load(nzShaderType_Vertex, vertexSource))
 	{
 		NazaraError("Failed to load vertex shader: " + shader->GetLog());
@@ -786,11 +788,6 @@ NzShader* NzShaderManager::GenerateShader(const NzShaderManagerParams& params)
 		return nullptr;
 	}
 
-	#ifdef NAZARA_DEBUG
-	NazaraNotice("Fragment shader source:\n" + fragmentSource);
-	NazaraNotice("Vertex shader source:\n" + vertexSource);
-	#endif
-
 	if (!shader->Compile())
 	{
 		NazaraError("Failed to compile shader: " + shader->GetLog());