real_tabasco_sauce/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Actions Activity

Tell the profiler about a few more bits of code

Browse Source 
This was SVN commit r9007.
This commit is contained in:
Ykkrosh 2011-03-03 22:38:01 +00:00
parent 58ae08522f
commit 6bcce22a88
4 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/graphics/ParticleEngine.cpp
View File

@ -24,6 +24,7 @@
#include "ParticleEngine.h"
#include "graphics/TextureManager.h"
#include "ps/Profile.h"
CParticleEngine *CParticleEngine::m_pInstance = 0;
CParticleEngine::CParticleEngine(void)
@ -143,6 +144,8 @@ CEmitter* CParticleEngine::FindEmitter(int ID)
void CParticleEngine::UpdateEmitters()
{
PROFILE("update particles");
tEmitterNode *temp = m_pHead;
totalParticles = 0;
while(temp)
@ -182,6 +185,8 @@ void CParticleEngine::UpdateEmitters()
void CParticleEngine::RenderParticles()
{
PROFILE("render particles");
EnterParticleContext();
tEmitterNode *temp = m_pHead;

1
source/ps/GameSetup/GameSetup.cpp
View File

@ -278,6 +278,7 @@ void Render()
// Draw the cursor (or set the Windows cursor, on Windows)
if (g_DoRenderCursor)
{
PROFILE("render cursor");
CStrW cursorName = g_CursorName;
if (cursorName.empty())
{

8
source/renderer/Renderer.cpp
View File

@ -724,6 +724,8 @@ void CRenderer::SetFastPlayerColor(bool fast)
// BeginFrame: signal frame start
void CRenderer::BeginFrame()
{
PROFILE("begin frame");
if (m_VertexShader)
m_VertexShader->BeginFrame();
@ -1178,6 +1180,8 @@ void CRenderer::RenderRefractions()
// RenderSubmissions: force rendering of any batched objects
void CRenderer::RenderSubmissions()
{
PROFILE("render submissions");
ogl_WarnIfError();
// Set the camera
@ -1208,8 +1212,10 @@ void CRenderer::RenderSubmissions()
}
// clear buffers
PROFILE_START("clear buffers");
glClearColor(m_ClearColor[0],m_ClearColor[1],m_ClearColor[2],m_ClearColor[3]);
glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT);
PROFILE_END("clear buffers");
ogl_WarnIfError();
@ -1295,6 +1301,8 @@ void CRenderer::RenderSubmissions()
// EndFrame: signal frame end
void CRenderer::EndFrame()
{
PROFILE("end frame");
// empty lists
m->terrainRenderer->EndFrame();
m->overlayRenderer.EndFrame();

11
source/renderer/TerrainOverlay.cpp
View File

@ -19,12 +19,13 @@
#include "TerrainOverlay.h"
#include "ps/Overlay.h"
#include "ps/Game.h"
#include "ps/World.h"
#include "graphics/Terrain.h"
#include "maths/MathUtil.h"
#include "lib/ogl.h"
#include "maths/MathUtil.h"
#include "ps/Game.h"
#include "ps/Overlay.h"
#include "ps/Profile.h"
#include "ps/World.h"
#include <algorithm>
@ -92,6 +93,8 @@ void TerrainOverlay::RenderOverlays()
if (g_TerrainOverlayList.size() == 0)
return;
PROFILE("render terrain overlays");
glEnable(GL_BLEND);
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
glDepthMask(GL_FALSE);