Permalink
Browse files

Logging part 2

  • Loading branch information...
1 parent 37f1f36 commit 68b167fbb62cf715c484fc436c8a57713ffb9188 @TimePath TimePath committed with Kangz Jan 21, 2016
Showing with 591 additions and 638 deletions.
  1. +0 −31 daemon/src/engine/client/cl_main.cpp
  2. +0 −11 daemon/src/engine/qcommon/logging.h
  3. +6 −6 daemon/src/engine/renderer/gl_shader.cpp
  4. +59 −59 daemon/src/engine/renderer/tr_animation.cpp
  5. +3 −3 daemon/src/engine/renderer/tr_backend.cpp
  6. +79 −79 daemon/src/engine/renderer/tr_bsp.cpp
  7. +21 −21 daemon/src/engine/renderer/tr_cmds.cpp
  8. +1 −1 daemon/src/engine/renderer/tr_decals.cpp
  9. +21 −21 daemon/src/engine/renderer/tr_fbo.cpp
  10. +11 −11 daemon/src/engine/renderer/tr_font.cpp
  11. +23 −23 daemon/src/engine/renderer/tr_image.cpp
  12. +12 −12 daemon/src/engine/renderer/tr_image_dds.cpp
  13. +1 −2 daemon/src/engine/renderer/tr_image_jpg.cpp
  14. +1 −1 daemon/src/engine/renderer/tr_image_ktx.cpp
  15. +6 −6 daemon/src/engine/renderer/tr_image_png.cpp
  16. +1 −1 daemon/src/engine/renderer/tr_image_tga.cpp
  17. +45 −45 daemon/src/engine/renderer/tr_init.cpp
  18. +2 −2 daemon/src/engine/renderer/tr_main.cpp
  19. +3 −3 daemon/src/engine/renderer/tr_mesh.cpp
  20. +15 −15 daemon/src/engine/renderer/tr_model.cpp
  21. +20 −21 daemon/src/engine/renderer/tr_model_iqm.cpp
  22. +2 −2 daemon/src/engine/renderer/tr_model_md3.cpp
  23. +28 −28 daemon/src/engine/renderer/tr_model_md5.cpp
  24. +0 −3 daemon/src/engine/renderer/tr_public.h
  25. +5 −5 daemon/src/engine/renderer/tr_scene.cpp
  26. +8 −8 daemon/src/engine/renderer/tr_shade_calc.cpp
  27. +145 −145 daemon/src/engine/renderer/tr_shader.cpp
  28. +5 −5 daemon/src/engine/renderer/tr_skin.cpp
  29. +1 −1 daemon/src/engine/renderer/tr_surface.cpp
  30. +11 −11 daemon/src/engine/renderer/tr_vbo.cpp
  31. +2 −2 daemon/src/engine/renderer/tr_world.cpp
  32. +54 −54 daemon/src/engine/sys/sdl_glimp.cpp
@@ -3083,36 +3083,6 @@ void CL_SetRecommended_f()
}
/*
-================
-CL_RefPrintf
-
-DLL glue
-================
-*/
-void QDECL PRINTF_LIKE(2) CL_RefPrintf( printParm_t print_level, const char *fmt, ... )
-{
- va_list argptr;
- char msg[ MAXPRINTMSG ];
-
- va_start( argptr, fmt );
- Q_vsnprintf( msg, sizeof( msg ), fmt, argptr );
- va_end( argptr );
-
- if ( print_level == printParm_t::PRINT_ALL )
- {
- Com_Printf( "%s", msg );
- }
- else if ( print_level == printParm_t::PRINT_WARNING )
- {
- Com_Printf( "%s%s", Color::CString( Color::Yellow ), msg ); // yellow
- }
- else if ( print_level == printParm_t::PRINT_DEVELOPER )
- {
- Log::Debug( "%s%s", Color::CString( Color::Red ), msg ); // red
- }
-}
-
-/*
============
CL_InitRenderer
============
@@ -3250,7 +3220,6 @@ bool CL_InitRef( )
ri.Cmd_Argv = Cmd_Argv;
ri.Cmd_QuoteString = Cmd_QuoteString;
- ri.Printf = CL_RefPrintf;
ri.Error = Com_Error;
ri.Milliseconds = CL_ScaledMilliseconds;
@@ -46,17 +46,6 @@
#define S_WARNING "^3Warning: ^*"
#define S_ERROR "^1ERROR: ^*"
-/**
- * print levels as currently used by the renderer
- */
-enum class printParm_t
-{
- PRINT_ALL,
- PRINT_DEVELOPER, // only print when "developer 1"
- PRINT_WARNING,
- PRINT_ERROR
-};
-
#ifdef ERR_FATAL
#undef ERR_FATAL // this is possibly defined in malloc.h
#endif
@@ -1041,7 +1041,7 @@ bool GLCompileMacro_USE_VERTEX_SKINNING::HasConflictingMacros( size_t permutatio
//if(GLCompileMacro_USE_VERTEX_ANIMATION* m = dynamic_cast<GLCompileMacro_USE_VERTEX_ANIMATION*>(macro))
if ( ( permutation & macro->GetBit() ) != 0 && macro->GetType() == USE_VERTEX_ANIMATION )
{
- //ri.Printf(printParm_t::PRINT_ALL, "conflicting macro! canceling '%s' vs. '%s'\n", GetName(), macro->GetName());
+ //Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
}
}
@@ -1060,7 +1060,7 @@ bool GLCompileMacro_USE_VERTEX_ANIMATION::HasConflictingMacros( size_t permutati
{
if ( ( permutation & macro->GetBit() ) != 0 && macro->GetType() == USE_VERTEX_SKINNING )
{
- //ri.Printf(printParm_t::PRINT_ALL, "conflicting macro! canceling '%s' vs. '%s'\n", GetName(), macro->GetName());
+ //Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
}
}
@@ -1081,7 +1081,7 @@ bool GLCompileMacro_USE_VERTEX_SPRITE::HasConflictingMacros( size_t permutation,
{
if ( ( permutation & macro->GetBit() ) != 0 && (macro->GetType() == USE_VERTEX_SKINNING || macro->GetType() == USE_VERTEX_ANIMATION))
{
- //ri.Printf(printParm_t::PRINT_ALL, "conflicting macro! canceling '%s' vs. '%s'\n", GetName(), macro->GetName());
+ //Log::Notice("conflicting macro! canceling '%s' vs. '%s'", GetName(), macro->GetName());
return true;
}
}
@@ -1104,7 +1104,7 @@ bool GLCompileMacro_USE_PARALLAX_MAPPING::MissesRequiredMacros( size_t permutati
if ( !foundUSE_NORMAL_MAPPING )
{
- //ri.Printf(printParm_t::PRINT_ALL, "missing macro! canceling '%s' <= '%s'\n", GetName(), "USE_NORMAL_MAPPING");
+ //Log::Notice("missing macro! canceling '%s' <= '%s'", GetName(), "USE_NORMAL_MAPPING");
return true;
}
@@ -1126,7 +1126,7 @@ bool GLCompileMacro_USE_REFLECTIVE_SPECULAR::MissesRequiredMacros( size_t permut
if ( !foundUSE_NORMAL_MAPPING )
{
- //ri.Printf(printParm_t::PRINT_ALL, "missing macro! canceling '%s' <= '%s'\n", GetName(), "USE_NORMAL_MAPPING");
+ //Log::Notice("missing macro! canceling '%s' <= '%s'", GetName(), "USE_NORMAL_MAPPING");
return true;
}
@@ -1143,7 +1143,7 @@ bool GLShader::GetCompileMacrosString( size_t permutation, std::string &compileM
{
if ( macro->HasConflictingMacros( permutation, _compileMacros ) )
{
- //ri.Printf(printParm_t::PRINT_ALL, "conflicting macro! canceling '%s'\n", macro->GetName());
+ //Log::Notice("conflicting macro! canceling '%s'", macro->GetName());
return false;
}
Oops, something went wrong.

0 comments on commit 68b167f

Please sign in to comment.