sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added NazaraDebug macro 

Former-commit-id: 5a8cec09bd4a7283f86d030ac2d867cda23736cd
This commit is contained in:
Lynix 2013-07-30 21:31:28 +02:00
parent f681587c63
commit 48e5af6373
3 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/Nazara/Core/Log.hpp
View File

@ -18,6 +18,12 @@
#include <Nazara/Core/ThreadSafetyOff.hpp> #include <Nazara/Core/ThreadSafetyOff.hpp>
#endif #endif
#ifdef NAZARA_DEBUG
#define NazaraDebug(txt) NazaraNotice(txt)
#else
#define NazaraDebug(txt)
#endif
#define NazaraLog NzLog::Instance() #define NazaraLog NzLog::Instance()
#define NazaraNotice(txt) NazaraLog->Write(txt) #define NazaraNotice(txt) NazaraLog->Write(txt)

6
src/Nazara/Renderer/OpenGL.cpp
View File

@ -4,6 +4,7 @@
#include <Nazara/Renderer/OpenGL.hpp> #include <Nazara/Renderer/OpenGL.hpp>
#include <Nazara/Core/Error.hpp> #include <Nazara/Core/Error.hpp>
#include <Nazara/Core/Log.hpp>
#include <Nazara/Math/Basic.hpp> #include <Nazara/Math/Basic.hpp>
#include <Nazara/Renderer/Context.hpp> #include <Nazara/Renderer/Context.hpp>
#include <cstring> #include <cstring>
@ -549,9 +550,12 @@ bool NzOpenGL::Initialize()
} }
s_openglVersion = major*100 + minor*10; s_openglVersion = major*100 + minor*10;
NazaraDebug("OpenGL " + NzString::Number(major) + '.' + NzString::Number(minor) + " detected");
if (s_openglVersion < 200) 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(); Uninitialize();
return false; return false;

7
src/Nazara/Renderer/ShaderManager.cpp
View File

@ -771,6 +771,7 @@ NzShader* NzShaderManager::GenerateShader(const NzShaderManagerParams& params)
} }
NzString fragmentSource = BuildFragmentCode(params); NzString fragmentSource = BuildFragmentCode(params);
NazaraDebug("Fragment shader source:\n" + fragmentSource);
if (!shader->Load(nzShaderType_Fragment, fragmentSource)) if (!shader->Load(nzShaderType_Fragment, fragmentSource))
{ {
NazaraError("Failed to load fragment shader: " + shader->GetLog()); NazaraError("Failed to load fragment shader: " + shader->GetLog());
@ -779,6 +780,7 @@ NzShader* NzShaderManager::GenerateShader(const NzShaderManagerParams& params)
} }
NzString vertexSource = BuildVertexCode(params); NzString vertexSource = BuildVertexCode(params);
NazaraDebug("Vertex shader source:\n" + vertexSource);
if (!shader->Load(nzShaderType_Vertex, vertexSource)) if (!shader->Load(nzShaderType_Vertex, vertexSource))
{ {
NazaraError("Failed to load vertex shader: " + shader->GetLog()); NazaraError("Failed to load vertex shader: " + shader->GetLog());
@ -786,11 +788,6 @@ NzShader* NzShaderManager::GenerateShader(const NzShaderManagerParams& params)
return nullptr; return nullptr;
} }
#ifdef NAZARA_DEBUG
NazaraNotice("Fragment shader source:\n" + fragmentSource);
NazaraNotice("Vertex shader source:\n" + vertexSource);
#endif
if (!shader->Compile()) if (!shader->Compile())
{ {
NazaraError("Failed to compile shader: " + shader->GetLog()); NazaraError("Failed to compile shader: " + shader->GetLog());