ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add some more gpu timer.

Browse Source
This commit is contained in:
vlj 2014-05-09 14:54:42 +02:00
parent 3e6ab6d7b6
commit 59f586c5ee
2 changed files with 108 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/graphics/irr_driver.hpp
View File

@ -77,9 +77,13 @@ enum STKRenderingPass
enum QueryPerf enum QueryPerf
{ {
Q_SOLID_PASS1, Q_SOLID_PASS1,
Q_SOLID_PASS2,
Q_LIGHT,
Q_SHADOWS, Q_SHADOWS,
Q_LIGHT,
Q_SSAO,
Q_SOLID_PASS2,
Q_TRANSPARENT,
Q_PARTICLES,
Q_DISPLACEMENT,
Q_LAST Q_LAST
}; };

37
src/graphics/render.cpp
View File

@ -216,26 +216,32 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, std::vector
const core::aabbox3df cambox = camnode->getViewFrustum()->getBoundingBox(); const core::aabbox3df cambox = camnode->getViewFrustum()->getBoundingBox();
PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
// Shadows // Shadows
{
PROFILER_PUSH_CPU_MARKER("- Shadow", 0x30, 0x6F, 0x90);
ScopedGPUTimer Timer(getGPUTimer(Q_SHADOWS));
if (!m_mipviz && !m_wireframe && UserConfigParams::m_dynamic_lights && if (!m_mipviz && !m_wireframe && UserConfigParams::m_dynamic_lights &&
UserConfigParams::m_shadows && hasShadow) UserConfigParams::m_shadows && hasShadow)
{
renderShadows(); renderShadows();
}
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
}
PROFILER_PUSH_CPU_MARKER("- Light", 0x00, 0xFF, 0x00);
// Lights // Lights
{
PROFILER_PUSH_CPU_MARKER("- Light", 0x00, 0xFF, 0x00);
ScopedGPUTimer Timer(getGPUTimer(Q_LIGHT));
renderLights(dt); renderLights(dt);
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
}
// Handle SSAO // Handle SSAO
{
PROFILER_PUSH_CPU_MARKER("- SSAO", 0xFF, 0xFF, 0x00); PROFILER_PUSH_CPU_MARKER("- SSAO", 0xFF, 0xFF, 0x00);
ScopedGPUTimer Timer(getGPUTimer(Q_SSAO));
if (UserConfigParams::m_ssao) if (UserConfigParams::m_ssao)
renderSSAO(); renderSSAO();
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
}
PROFILER_PUSH_CPU_MARKER("- Solid Pass 2", 0x00, 0x00, 0xFF); PROFILER_PUSH_CPU_MARKER("- Solid Pass 2", 0x00, 0x00, 0xFF);
if (!UserConfigParams::m_dynamic_lights) if (!UserConfigParams::m_dynamic_lights)
@ -274,19 +280,30 @@ void IrrDriver::renderScene(scene::ICameraSceneNode * const camnode, std::vector
computeSunVisibility(); computeSunVisibility();
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
// We need to re-render camera due to the per-cam-node hack. // Render transparent
{
PROFILER_PUSH_CPU_MARKER("- Transparent Pass", 0xFF, 0x00, 0x00); PROFILER_PUSH_CPU_MARKER("- Transparent Pass", 0xFF, 0x00, 0x00);
ScopedGPUTimer Timer(getGPUTimer(Q_TRANSPARENT));
renderTransparent(); renderTransparent();
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
}
// Render particles
{
PROFILER_PUSH_CPU_MARKER("- Particles", 0xFF, 0xFF, 0x00); PROFILER_PUSH_CPU_MARKER("- Particles", 0xFF, 0xFF, 0x00);
ScopedGPUTimer Timer(getGPUTimer(Q_PARTICLES));
renderParticles(); renderParticles();
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
}
// Render displacement
{
PROFILER_PUSH_CPU_MARKER("- Displacement", 0x00, 0x00, 0xFF); PROFILER_PUSH_CPU_MARKER("- Displacement", 0x00, 0x00, 0xFF);
ScopedGPUTimer Timer(getGPUTimer(Q_DISPLACEMENT));
renderDisplacement(); renderDisplacement();
PROFILER_POP_CPU_MARKER(); PROFILER_POP_CPU_MARKER();
} }
}
// -------------------------------------------- // --------------------------------------------
@ -638,13 +655,9 @@ void IrrDriver::renderShadows()
glDrawBuffer(GL_NONE); glDrawBuffer(GL_NONE);
glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedObject::ViewProjectionMatrixesUBO); glBindBufferBase(GL_UNIFORM_BUFFER, 0, SharedObject::ViewProjectionMatrixesUBO);
{
ScopedGPUTimer Timer(getGPUTimer(Q_SHADOWS));
m_scene_manager->drawAll(scene::ESNRP_SOLID); m_scene_manager->drawAll(scene::ESNRP_SOLID);
}
glDisable(GL_POLYGON_OFFSET_FILL); glDisable(GL_POLYGON_OFFSET_FILL);
glViewport(0, 0, UserConfigParams::m_width, UserConfigParams::m_height); glViewport(0, 0, UserConfigParams::m_width, UserConfigParams::m_height);
} }
@ -766,9 +779,6 @@ void IrrDriver::renderLights(float dt)
const core::vector3df &campos = const core::vector3df &campos =
irr_driver->getSceneManager()->getActiveCamera()->getAbsolutePosition(); irr_driver->getSceneManager()->getActiveCamera()->getAbsolutePosition();
{
ScopedGPUTimer Timer(getGPUTimer(Q_LIGHT));
std::vector<LightNode *> BucketedLN[15]; std::vector<LightNode *> BucketedLN[15];
for (unsigned int i = 0; i < lightcount; i++) for (unsigned int i = 0; i < lightcount; i++)
{ {
@ -834,7 +844,6 @@ void IrrDriver::renderLights(float dt)
renderPointLights(MIN2(lightnum, MAXLIGHT)); renderPointLights(MIN2(lightnum, MAXLIGHT));
if (SkyboxCubeMap) if (SkyboxCubeMap)
m_post_processing->renderDiffuseEnvMap(blueSHCoeff, greenSHCoeff, redSHCoeff); m_post_processing->renderDiffuseEnvMap(blueSHCoeff, greenSHCoeff, redSHCoeff);
}
gl_driver->extGlDrawBuffers(1, bufs); gl_driver->extGlDrawBuffers(1, bufs);
} }