Skip to content

Commit

Permalink
A little logging changes
Browse files Browse the repository at this point in the history
Also fix includes
  • Loading branch information
Xottab-DUTY committed Jan 8, 2018
1 parent 65ac56a commit a644bf5
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 2 deletions.
9 changes: 7 additions & 2 deletions src/Layers/xrRender/ResourceManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@

#include "ResourceManager.h"
#include "tss.h"
#include "blenders\blender.h"
#include "blenders\blender_recorder.h"
#include "blenders/blender.h"
#include "blenders/blender_recorder.h"
#include "xrCore/Threading/ThreadPool.hpp"

// Already defined in Texture.cpp
Expand Down Expand Up @@ -358,7 +358,9 @@ void CResourceManager::DeferredUpload()
if (!RDEVICE.b_is_Ready)
return;

#ifdef DEBUG
Msg("%s, amount of textures = %d", __FUNCTION__ , m_textures.size());
#endif

CTimer timer;
timer.Start();
Expand All @@ -375,7 +377,10 @@ void CResourceManager::DeferredUpload()
ttapi.wait();

textures_to_load.clear();

#ifdef DEBUG
Msg("%s, texture loading time = %d", __FUNCTION__, timer.GetElapsed_ms());
#endif
}
/*
void CResourceManager::DeferredUnload ()
Expand Down
1 change: 1 addition & 0 deletions src/xrEngine/IGame_Persistent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,7 @@ void IGame_Persistent::Prefetch()
ObjectPool.prefetch();
Log("Loading models...");
GEnv.Render->models_Prefetch();
Log("Loading textures...");
GEnv.Render->ResourcesDeferredUpload();

p_time = 1000.f * Device.GetTimerGlobal()->GetElapsed_sec() - p_time;
Expand Down

0 comments on commit a644bf5

Please sign in to comment.