kraken_engine/kraken
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

On-screen Profiler / Debug visualizations in progress

Browse Source 
Added on-screen FPS counter.
This commit is contained in:
Kearwood Gilbert
2013-03-22 17:17:12 -07:00
parent a23b39a178
commit b34d90f41d
7 changed files with 104 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
KREngine/kraken/KRCamera.cpp
View File

@@ -36,6 +36,8 @@
#include "KRDirectionalLight.h"
KRCamera::KRCamera(KRScene &scene, std::string name) : KRNode(scene, name) {
m_last_frame_start = 0;
m_particlesAbsoluteTime = 0.0f;
backingWidth = 0;
backingHeight = 0;
@@ -51,6 +53,7 @@ KRCamera::KRCamera(KRScene &scene, std::string name) : KRNode(scene, name) {
volumetricLightAccumulationBuffer = 0;
volumetricLightAccumulationTexture = 0;
m_frame_times_filled = 0;
m_debug_text_vertices = NULL;
}
@@ -64,6 +67,16 @@ KRCamera::~KRCamera() {
void KRCamera::renderFrame(float deltaTime, GLint renderBufferWidth, GLint renderBufferHeight)
{
// ----====---- Record timing information for measuring FPS ----====----
uint64_t current_time = m_pContext->getAbsoluteTimeMilliseconds();
if(m_last_frame_start != 0) {
m_frame_times[m_pContext->getCurrentFrame() % KRAKEN_FPS_AVERAGE_FRAME_COUNT] = (current_time - m_last_frame_start);
if(m_frame_times_filled < KRAKEN_FPS_AVERAGE_FRAME_COUNT) m_frame_times_filled++;
}
m_last_frame_start = current_time;
GLint defaultFBO;
GLDEBUG(glGetIntegerv(GL_FRAMEBUFFER_BINDING, &defaultFBO));
@@ -806,12 +819,67 @@ std::string KRCamera::getDebugText()
std::stringstream stream;
stream.precision(std::numeric_limits<long double>::digits10);
uint64_t fps = 0;
if(m_frame_times_filled == KRAKEN_FPS_AVERAGE_FRAME_COUNT) {
for(int i=0; i < KRAKEN_FPS_AVERAGE_FRAME_COUNT; i++) {
fps += m_frame_times[i];
}
}
fps = 1000000 / (fps / KRAKEN_FPS_AVERAGE_FRAME_COUNT); // Order of division chosen to prevent overflow
switch(settings.debug_display) {
case 0: // ----====---- No debug display ----====----
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_NONE: // ----====---- No debug display ----====----
break;
case 1: // ----====---- Memory Utilization ----=====----
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_TIME: // ----====---- Time / FPS ----====----
{
if(fps > 0) {
stream << "FPS\t" << fps;
}
}
break;
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_MEMORY: // ----====---- Memory Utilization ----=====----
{
// ---- CPU Memory ----
struct task_basic_info info;
mach_msg_type_number_t size = sizeof(info);
kern_return_t kerr = task_info(mach_task_self(),
TASK_BASIC_INFO,
(task_info_t)&info,
&size);
if( kerr == KERN_SUCCESS ) {
stream << "\tResident\tVirtual\tTotal";
stream << "\nCPU\t" << (info.resident_size / 1024 / 1024) << " MB\t" << (info.virtual_size / 1024 / 1024) << " MB\t" << ((info.resident_size + info.virtual_size) / 1024 / 1024) << " MB";
} else {
stream << "\nERROR: Could not get CPU memory utilization.";
}
mach_port_t host_port = mach_host_self();
mach_msg_type_number_t host_size = sizeof(vm_statistics_data_t) / sizeof(integer_t);
vm_size_t pagesize = 0;
vm_statistics_data_t vm_stat;
if(host_page_size(host_port, &pagesize) != KERN_SUCCESS) {
stream << "\n\nERROR: Could not get VM page size.";
} else if(host_statistics(host_port, HOST_VM_INFO, (host_info_t)&vm_stat, &host_size) != KERN_SUCCESS) {
stream << "\n\nERROR: Could not get VM stats.";
} else {
stream << "\n\n\n\tWired\tActive\tInactive\tFree\tTotal";
stream << "\nVM\t";
stream << (vm_stat.wire_count * pagesize / 1024 / 1024) << " MB\t";
stream << (vm_stat.active_count * pagesize / 1024 / 1024) << " MB\t";
stream << (vm_stat.inactive_count * pagesize / 1024 / 1024) << " MB\t";
stream << (vm_stat.free_count * pagesize / 1024 / 1024) << " MB\t";
stream << ((vm_stat.wire_count + vm_stat.active_count + vm_stat.inactive_count) * pagesize / 1024 / 1024) << " MB";
}
// ---- GPU Memory ----
int texture_count_active = m_pContext->getTextureManager()->getActiveTextures().size();
int texture_count_pooled = m_pContext->getTextureManager()->getPoolTextures().size();
int texture_count = texture_count_active + texture_count_pooled;
@@ -829,15 +897,15 @@ std::string KRCamera::getDebugText()
long total_mem_used = texture_mem_used + vbo_mem_used;
long total_mem_throughput = texture_mem_throughput + vbo_mem_throughput;
stream << "\t# Active\t# Used\tActive\tUsed\tThroughput\n";
stream << "\n\n\n\t# Active\t# Used\tActive\tUsed\tThroughput\n";
stream << "Textures\t" << texture_count_active << "\t" << texture_count << "\t" << (texture_mem_active / 1024) << " Kb\t" << (texture_mem_used / 1024) << " Kb\t" << (texture_mem_throughput / 1024) << " Kb / frame\n";
stream << "VBO's\t" << vbo_count_active << "\t" << vbo_count_active + vbo_count_pooled << "\t" << (vbo_mem_active / 1024) <<" Kb\t" << (vbo_mem_used / 1024) << " Kb\t" << (vbo_mem_throughput / 1024) << " Kb / frame\n";
stream << "\nGPU Total\t\t\t" << (total_mem_active / 1024) << " Kb\t" << (total_mem_used / 1024) << " Kb\t" << (total_mem_throughput / 1024) << " Kb / frame";
stream << "Textures\t" << texture_count_active << "\t" << texture_count << "\t" << (texture_mem_active / 1024) << " KB\t" << (texture_mem_used / 1024) << " KB\t" << (texture_mem_throughput / 1024) << " KB / frame\n";
stream << "VBO's\t" << vbo_count_active << "\t" << vbo_count_active + vbo_count_pooled << "\t" << (vbo_mem_active / 1024) <<" KB\t" << (vbo_mem_used / 1024) << " KB\t" << (vbo_mem_throughput / 1024) << " KB / frame\n";
stream << "\nGPU Total\t\t\t" << (total_mem_active / 1024) << " KB\t" << (total_mem_used / 1024) << " KB\t" << (total_mem_throughput / 1024) << " KB / frame";
}
break;
case 2: // ----====---- List Active Textures ----====----
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_TEXTURES: // ----====---- List Active Textures ----====----
{
bool first = true;
int texture_count = 0;
@@ -852,7 +920,7 @@ std::string KRCamera::getDebugText()
stream << texture->getName();
stream << "\t";
stream << texture->getMemSize() / 1024;
stream << " kB";
stream << " KB";
stream << "\t";
stream << texture->getMaxMipMap();
if(texture->hasMipmaps() && texture->getCurrentLodMaxDim() != texture->getMaxMipMap()) {
@@ -866,11 +934,11 @@ std::string KRCamera::getDebugText()
stream << "\n\nTOTAL: ";
stream << texture_count;
stream << " textures\t";
stream << (m_pContext->getTextureManager()->getMemActive() / 1024) << " Kb";
stream << (m_pContext->getTextureManager()->getMemActive() / 1024) << " KB";
}
break;
case 3: // ----====---- List Draw Calls ----====----
case KRRenderSettings::KRENGINE_DEBUG_DISPLAY_DRAW_CALLS: // ----====---- List Draw Calls ----====----
{
std::vector<KRMeshManager::draw_call_info> draw_calls = m_pContext->getModelManager()->getDrawCalls();

7
KREngine/kraken/KRCamera.h
View File

@@ -44,6 +44,8 @@
#include "KRViewport.h"
#include "KRRenderSettings.h"
#define KRAKEN_FPS_AVERAGE_FRAME_COUNT 30
class KRModel;
class KRScene;
class KRViewport;
@@ -79,6 +81,7 @@ private:
float m_particlesAbsoluteTime;
typedef struct {
GLfloat x;
GLfloat y;
@@ -90,6 +93,10 @@ private:
DebugTextVertexData *m_debug_text_vertices;
std::string getDebugText();
uint64_t m_last_frame_start;
int m_frame_times[KRAKEN_FPS_AVERAGE_FRAME_COUNT];
int m_frame_times_filled;
};
#endif

6
KREngine/kraken/KRContext.cpp
View File

@@ -218,3 +218,9 @@ float KRContext::getAbsoluteTime() const
return m_absolute_time;
}
long KRContext::getAbsoluteTimeMilliseconds()
{
return (long)(mach_absolute_time() / 1000 * m_timebase_info.numer / m_timebase_info.denom); // Division done first to avoid potential overflow
}

2
KREngine/kraken/KRContext.h
View File

@@ -70,6 +70,8 @@ public:
long getCurrentFrame() const;
float getAbsoluteTime() const;
long getAbsoluteTimeMilliseconds();
private:
KRBundleManager *m_pBundleManager;
KRSceneManager *m_pSceneManager;

4
KREngine/kraken/KREngine.mm
View File

@@ -597,7 +597,7 @@ void kraken::set_parameter(const std::string &parameter_name, float parameter_va
_settings.dust_particle_intensity = v;
break;
case 48:
_settings.debug_display = v;
_settings.debug_display = (KRRenderSettings::debug_display_type)v;
break;
}
}
@@ -622,7 +622,7 @@ void kraken::set_parameter(const std::string &parameter_name, float parameter_va
1.0f, 10.0f, 2.0f, 1.0f, 1.0f, 1.0f, 5.0f, 1.0f, 0.5f, 1.0f,
2.0f, 2.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f,
1.0f, 1.0f, 10.0f, 1000.0f, 1.0f, 5.0f, 1000.0f, 1.0f, 5.0f, 3.0f,
1000.0f, 1000.0f, 0.01f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, 3.0f
1000.0f, 1000.0f, 0.01f, 1.0f, 1.0f, 1.0f, 1.0f, 1.0f, (float)(KRRenderSettings::KRENGINE_DEBUG_DISPLAY_NUMBER - 1)
};
return maxValues[i];

3
KREngine/kraken/KRRenderSettings.cpp
View File

@@ -73,8 +73,7 @@ KRRenderSettings::KRRenderSettings()
dust_particle_intensity = 0.25f;
dust_particle_enable = false;
debug_display = 0;
debug_display = KRENGINE_DEBUG_DISPLAY_NONE;
}
KRRenderSettings::~KRRenderSettings()

9
KREngine/kraken/KRRenderSettings.h
View File

@@ -85,7 +85,14 @@ public:
std::string m_skyBoxName;
int debug_display;
enum debug_display_type{
KRENGINE_DEBUG_DISPLAY_NONE = 0,
KRENGINE_DEBUG_DISPLAY_TIME,
KRENGINE_DEBUG_DISPLAY_MEMORY,
KRENGINE_DEBUG_DISPLAY_TEXTURES,
KRENGINE_DEBUG_DISPLAY_DRAW_CALLS,
KRENGINE_DEBUG_DISPLAY_NUMBER
} debug_display;
private:
};