diff --git a/source/gui/scripting/ScriptFunctions.cpp b/source/gui/scripting/ScriptFunctions.cpp index bf59876c4e..5f559ed121 100644 --- a/source/gui/scripting/ScriptFunctions.cpp +++ b/source/gui/scripting/ScriptFunctions.cpp @@ -341,7 +341,7 @@ void SetCameraTarget(void* UNUSED(cbdata), float x, float y, float z) // Useful for testing the crashlog/stack trace code. int Crash(void* UNUSED(cbdata)) { - MICROLOG(L"Crashing at user's request."); + debug_printf(L"Crashing at user's request.\n"); return *(int*)0; } diff --git a/source/main.cpp b/source/main.cpp index fcbfd43a22..a7b2b6fad4 100644 --- a/source/main.cpp +++ b/source/main.cpp @@ -220,7 +220,6 @@ static bool quit = false; // break out of main loop static void Frame() { - MICROLOG(L"Frame"); ogl_WarnIfError(); // get elapsed time @@ -260,7 +259,6 @@ static void Frame() bool is_building_archive; // must come before PROFILE_START's { PROFILE_START("build archive"); - MICROLOG(L"build archive"); is_building_archive = ProgressiveBuildArchive(); PROFILE_END( "build archive"); @@ -272,13 +270,11 @@ static void Frame() if(!is_building_archive) { PROFILE_START("reload changed files"); - MICROLOG(L"reload changed files"); ReloadChangedFiles(); PROFILE_END( "reload changed files"); } PROFILE_START("progressive load"); - MICROLOG(L"progressive load"); ProgressiveLoad(); PROFILE_END("progressive load"); @@ -287,7 +283,6 @@ static void Frame() PROFILE_END("renderer incremental load"); PROFILE_START("input"); - MICROLOG(L"input"); PumpEvents(); PROFILE_END("input"); @@ -312,7 +307,6 @@ static void Frame() ogl_WarnIfError(); PROFILE_START("gui tick"); - MICROLOG(L"gui tick"); g_GUI->TickObjects(); PROFILE_END("gui tick"); @@ -364,9 +358,7 @@ static void Frame() ogl_WarnIfError(); if(need_render) { - MICROLOG(L"render"); Render(); - MICROLOG(L"finished render"); PROFILE_START( "swap buffers" ); SDL_GL_SwapBuffers(); PROFILE_END( "swap buffers" ); diff --git a/source/pch/engine/precompiled.h b/source/pch/engine/precompiled.h index 2229fcebc4..d8fb31c4f9 100644 --- a/source/pch/engine/precompiled.h +++ b/source/pch/engine/precompiled.h @@ -19,7 +19,7 @@ // "engine"-specific PCH: -#include "ps/Pyrogenesis.h" // MICROLOG and old error system +#include "ps/Pyrogenesis.h" // old error system #if HAVE_PCH diff --git a/source/ps/GameSetup/Config.cpp b/source/ps/GameSetup/Config.cpp index bdc53e7542..673b3879df 100644 --- a/source/ps/GameSetup/Config.cpp +++ b/source/ps/GameSetup/Config.cpp @@ -176,7 +176,6 @@ static void ProcessCommandLineArgs(const CmdLineArgs& args) void CONFIG_Init(const CmdLineArgs& args) { TIMER(L"CONFIG_Init"); - MICROLOG(L"init config"); new CConfigDB; diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp index 431b3c1a92..9a5b727304 100644 --- a/source/ps/GameSetup/GameSetup.cpp +++ b/source/ps/GameSetup/GameSetup.cpp @@ -194,8 +194,6 @@ void GUI_DisplayLoadProgress(int percent, const wchar_t* pending_task) void Render() { - MICROLOG(L"begin frame"); - ogl_WarnIfError(); CStr skystring = "255 0 255"; @@ -291,7 +289,6 @@ void Render() glPopMatrix(); glPopAttrib(); - MICROLOG(L"end frame"); g_Renderer.EndFrame(); ogl_WarnIfError(); @@ -569,7 +566,6 @@ static void InitRenderer() // create the material manager new CMaterialManager; - MICROLOG(L"init renderer"); g_Renderer.Open(g_xres,g_yres); // Setup lighting environment. Since the Renderer accesses the @@ -591,7 +587,6 @@ static void InitRenderer() static void InitSDL() { - MICROLOG(L"init sdl"); if(SDL_Init(SDL_INIT_VIDEO|SDL_INIT_TIMER|SDL_INIT_NOPARACHUTE) < 0) { LOG(CLogger::Error, LOG_CATEGORY, L"SDL library initialization failed: %hs", SDL_GetError()); @@ -618,8 +613,6 @@ void EndGame() void Shutdown(int UNUSED(flags)) { - MICROLOG(L"Shutdown"); - EndGame(); ShutdownPs(); // Must delete g_GUI before g_ScriptingHost @@ -689,8 +682,6 @@ void Shutdown(int UNUSED(flags)) void EarlyInit() { - MICROLOG(L"EarlyInit"); - // If you ever want to catch a particular allocation: //_CrtSetBreakAlloc(232647); @@ -724,14 +715,11 @@ static bool Autostart(const CmdLineArgs& args); void Init(const CmdLineArgs& args, int flags) { - MICROLOG(L"Init"); - h_mgr_init(); // Do this as soon as possible, because it chdirs // and will mess up the error reporting if anything // crashes before the working directory is set. - MICROLOG(L"init vfs"); InitVfs(args); // This must come after VFS init, which sets the current directory @@ -770,7 +758,6 @@ void Init(const CmdLineArgs& args, int flags) g_ScriptStatsTable = new CScriptStatsTable; g_ProfileViewer.AddRootTable(g_ScriptStatsTable); - MICROLOG(L"init scripting"); InitScripting(); // before GUI // g_ConfigDB, command line args, globals diff --git a/source/ps/Pyrogenesis.h b/source/ps/Pyrogenesis.h index 3bc0850e75..059f4c6fb9 100644 --- a/source/ps/Pyrogenesis.h +++ b/source/ps/Pyrogenesis.h @@ -24,8 +24,6 @@ Standard declarations which are included in all projects. #ifndef INCLUDED_PYROGENESIS #define INCLUDED_PYROGENESIS -#define MICROLOG debug_wprintf_mem - // overrides ah_translate. registered in GameSetup.cpp extern const wchar_t* psTranslate(const wchar_t* text); extern void psTranslateFree(const wchar_t* text); diff --git a/source/renderer/Renderer.cpp b/source/renderer/Renderer.cpp index 78e110e0d3..85387870cf 100644 --- a/source/renderer/Renderer.cpp +++ b/source/renderer/Renderer.cpp @@ -30,7 +30,6 @@ #include "Renderer.h" #include "maths/Matrix3D.h" #include "maths/MathUtil.h" -#include "ps/Pyrogenesis.h" // MICROLOG #include "ps/CLogger.h" #include "ps/Game.h" #include "ps/Profile.h" @@ -874,17 +873,14 @@ void CRenderer::RenderPatches() // switch on wireframe if we need it if (m_TerrainRenderMode==WIREFRAME) { - MICROLOG(L"wireframe on"); glPolygonMode(GL_FRONT_AND_BACK,GL_LINE); } // render all the patches, including blend pass - MICROLOG(L"render patch submissions"); m->terrainRenderer->RenderTerrain(m_Options.m_Shadows ? m->shadow : 0); if (m_TerrainRenderMode==WIREFRAME) { // switch wireframe off again - MICROLOG(L"wireframe off"); glPolygonMode(GL_FRONT_AND_BACK,GL_FILL); } else if (m_TerrainRenderMode==EDGED_FACES) { // edged faces: need to make a second pass over the data: @@ -1223,7 +1219,6 @@ void CRenderer::RenderSubmissions() if (m_Options.m_Shadows) { - MICROLOG(L"render shadows"); RenderShadowMap(); } @@ -1243,7 +1238,6 @@ void CRenderer::RenderSubmissions() } // render submitted patches and models - MICROLOG(L"render patches"); RenderPatches(); ogl_WarnIfError(); @@ -1263,24 +1257,20 @@ void CRenderer::RenderSubmissions() PROFILE_END("render overlays"); ogl_WarnIfError(); - MICROLOG(L"render models"); RenderModels(); ogl_WarnIfError(); // render transparent stuff, so it can overlap models/terrain - MICROLOG(L"render transparent"); RenderTransparentModels(); ogl_WarnIfError(); // render water if (m_WaterManager->m_RenderWater && g_Game) { - MICROLOG(L"render water"); m->terrainRenderer->RenderWater(); ogl_WarnIfError(); // render transparent stuff again, so it can overlap the water - MICROLOG(L"render transparent 2"); RenderTransparentModels(); ogl_WarnIfError(); @@ -1298,14 +1288,12 @@ void CRenderer::RenderSubmissions() glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); // Particle Engine Rendering. - MICROLOG(L"render particles"); CParticleEngine::GetInstance()->RenderParticles(); ogl_WarnIfError(); // render debug lines if (m_DisplayFrustum) { - MICROLOG(L"display frustum"); DisplayFrustum(); m->shadow->RenderDebugDisplay(); ogl_WarnIfError(); @@ -1318,7 +1306,6 @@ void CRenderer::RenderSubmissions() ogl_WarnIfError(); // empty lists - MICROLOG(L"empty lists"); m->terrainRenderer->EndFrame(); m->overlayRenderer.EndFrame(); @@ -1445,12 +1432,10 @@ void CRenderer::RenderScene(Scene *scene) { CFrustum frustum = m_CullCamera.GetFrustum(); - MICROLOG(L"collect objects"); scene->EnumerateObjects(frustum, this); ogl_WarnIfError(); - MICROLOG(L"flush objects"); RenderSubmissions(); } diff --git a/source/renderer/TerrainRenderer.cpp b/source/renderer/TerrainRenderer.cpp index b902f4dfe0..4d04d08066 100644 --- a/source/renderer/TerrainRenderer.cpp +++ b/source/renderer/TerrainRenderer.cpp @@ -34,7 +34,6 @@ #include "ps/CLogger.h" #include "ps/Game.h" #include "ps/Profile.h" -#include "ps/Pyrogenesis.h" // MICROLOG #include "ps/World.h" #include "simulation2/Simulation2.h" @@ -166,7 +165,6 @@ void TerrainRenderer::RenderTerrain(ShadowMap* shadow) // render everything fullbright // set up texture environment for base pass - MICROLOG(L"base splat textures"); pglActiveTextureARB(GL_TEXTURE0); pglClientActiveTextureARB(GL_TEXTURE0); glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);