Index: trunk/src/gl/gl_context.cc
===================================================================
--- trunk/src/gl/gl_context.cc	(revision 364)
+++ trunk/src/gl/gl_context.cc	(revision 365)
@@ -8,4 +8,5 @@
 #include "nv/lib/gl.hh"
 #include "nv/gl/gl_device.hh"
+#include "nv/core/logger.hh"
 
 using namespace nv;
@@ -168,17 +169,17 @@
 		switch ( result )
 		{
-		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer incomplete attachment!" ); break;
-		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer missing attachment!" ); break;
-		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer incomplete dimensions!" ); break;
-		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS            : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer incomplete formats!" ); break;
-		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer incomplete draw buffer!" ); break;
-		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER        : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer incomplete read buffer!" ); break;
-		case GL_FRAMEBUFFER_UNSUPPORTED                   : NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer format combination unsupported!" ); break;
-		default : NV_LOG( LOG_ERROR, "gl_context::check : Unknown Framebuffer error! (" << result << ")" ); break;
+		case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT         : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete attachment!" ); break;
+		case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT : NV_LOG_ERROR( "gl_context::check : Framebuffer missing attachment!" ); break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS         : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete dimensions!" ); break;
+		case GL_FRAMEBUFFER_INCOMPLETE_FORMATS            : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete formats!" ); break;
+		case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER        : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete draw buffer!" ); break;
+		case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER        : NV_LOG_ERROR( "gl_context::check : Framebuffer incomplete read buffer!" ); break;
+		case GL_FRAMEBUFFER_UNSUPPORTED                   : NV_LOG_ERROR( "gl_context::check : Framebuffer format combination unsupported!" ); break;
+		default: NV_LOG_ERROR( "gl_context::check : Unknown Framebuffer error! (", result, ")" ); break;
 		}
 	}
 	else
 	{
-		NV_LOG( LOG_ERROR, "gl_context::check : Framebuffer extensions not loaded!" );
+		NV_LOG_ERROR( "gl_context::check : Framebuffer extensions not loaded!" );
 	}
 	return false;
Index: trunk/src/gl/gl_device.cc
===================================================================
--- trunk/src/gl/gl_device.cc	(revision 364)
+++ trunk/src/gl/gl_device.cc	(revision 365)
@@ -41,5 +41,5 @@
 	if (!image)
 	{
-		NV_LOG( LOG_ERROR, "Image file " << filename << " not found!" );
+		NV_LOG_ERROR( "Image file ", filename, " not found!" );
 		return nullptr;
 	}
@@ -59,5 +59,5 @@
 	if ( !image )
 	{
-		NV_LOG( LOG_ERROR, "Image binary data cannot be loaded found!" );
+		NV_LOG_ERROR( "Image binary data cannot be loaded found!" );
 		return nullptr;
 	}
@@ -228,5 +228,5 @@
 		if ( fatal )
 		{
-			NV_LOG( LOG_ERROR, "Uniform '" << name << "' not found in program!" );
+			NV_LOG_ERROR( "Uniform '", name, "' not found in program!" );
 			NV_THROW( runtime_error, ( "Uniform '"+name+"' not found!" ) );
 		}
@@ -247,6 +247,6 @@
 		if ( fatal )
 		{
-			NV_LOG( LOG_ERROR, "Attribute '" << name << "' not found in program!" );
-			NV_THROW( runtime_error, ( "Attribute '"+name+"' not found!" ) );
+			NV_LOG_ERROR( "Attribute '", name, "' not found in program!" );
+			NV_THROW( runtime_error, ( "Attribute '"+ name + "' not found!" ) );
 		}
 	}
@@ -279,9 +279,9 @@
 	glGetProgramInfoLog( p->glid, buffer_size, &length, buffer );
 
-	NV_LOG( LOG_INFO, "Program #" << p->glid << (status == GL_FALSE ? " failed to compile!" : " compiled successfully.") );
+	NV_LOG_INFO( "Program #", p->glid, (status == GL_FALSE ? " failed to compile!" : " compiled successfully.") );
 
 	if ( length > 0 )
 	{
-		NV_LOG( LOG_INFO, "Program #" << p->glid << " log: " << buffer );
+		NV_LOG_INFO( "Program #", p->glid, " log: ", buffer );
 	}
 
@@ -297,5 +297,5 @@
 	{
 		glGetProgramInfoLog( p->glid, buffer_size, &length, buffer );
-		NV_LOG( LOG_ERROR, "Program #" << p->glid << " validation error : " << buffer );
+		NV_LOG_ERROR( "Program #", p->glid, " validation error : ", buffer );
 		return false;
 	}
@@ -418,14 +418,14 @@
 		if ( compile_ok == 0 )
 		{
-			NV_LOG( LOG_ERROR, "Shader #" << glid << " error: " << buffer );
+			NV_LOG_ERROR( "Shader #", glid, " error: ", buffer );
 		}
 		else
 		{
-			NV_LOG( LOG_INFO, "Shader #" << glid << " compiled successfully: " << buffer );
+			NV_LOG_INFO( "Shader #", glid, " compiled successfully: ", buffer );
 		}
 	}
 	else
 	{
-		NV_LOG( LOG_INFO, "Shader #" << glid << " compiled successfully." );
+		NV_LOG_INFO( "Shader #", glid, " compiled successfully." );
 	}
 	return compile_ok != 0;