summaryrefslogtreecommitdiffstats
path: root/src/core
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-02-18 12:21:47 +0100
committeraap <aap@papnet.eu>2021-02-18 12:21:47 +0100
commit9db87fc6365ee76f3281ca2474f92ec4f155920d (patch)
tree1b60c229e7ac6212d1d96025d32473c9ec9f6eef /src/core
parentupdate librw (diff)
downloadre3-9db87fc6365ee76f3281ca2474f92ec4f155920d.tar
re3-9db87fc6365ee76f3281ca2474f92ec4f155920d.tar.gz
re3-9db87fc6365ee76f3281ca2474f92ec4f155920d.tar.bz2
re3-9db87fc6365ee76f3281ca2474f92ec4f155920d.tar.lz
re3-9db87fc6365ee76f3281ca2474f92ec4f155920d.tar.xz
re3-9db87fc6365ee76f3281ca2474f92ec4f155920d.tar.zst
re3-9db87fc6365ee76f3281ca2474f92ec4f155920d.zip
Diffstat (limited to '')
-rw-r--r--src/core/main.cpp16
-rw-r--r--src/core/main.h6
2 files changed, 22 insertions, 0 deletions
diff --git a/src/core/main.cpp b/src/core/main.cpp
index b47f5d37..5eccf759 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1313,6 +1313,7 @@ if(gbRenderEverythingBarRoads)
void
RenderScene_new(void)
{
+ PUSH_RENDERGROUP("RenderScene_new");
CClouds::Render();
DoRWRenderHorizon();
@@ -1320,6 +1321,7 @@ RenderScene_new(void)
DefinedState();
// CMattRenderer::ResetRenderStates
// moved CRenderer::RenderBoats to before transparent water
+ POP_RENDERGROUP();
}
// TODO
@@ -1327,6 +1329,7 @@ bool FredIsInFirstPersonCam(void) { return false; }
void
RenderEffects_new(void)
{
+ PUSH_RENDERGROUP("RenderEffects_new");
CShadows::RenderStaticShadows();
// CRenderer::GenerateEnvironmentMap
CShadows::RenderStoredShadows();
@@ -1369,6 +1372,7 @@ if(gbRenderFadingInEntities)
CPointLights::RenderFogEffect();
CMovingThings::Render();
CRenderer::RenderFirstPersonVehicle();
+ POP_RENDERGROUP();
}
#endif
@@ -1381,6 +1385,7 @@ RenderScene(void)
return;
}
#endif
+ PUSH_RENDERGROUP("RenderScene");
CClouds::Render();
DoRWRenderHorizon();
CRenderer::RenderRoads();
@@ -1395,11 +1400,13 @@ RenderScene(void)
CRenderer::RenderVehiclesButNotBoats();
#endif
CWeather::RenderRainStreaks();
+ POP_RENDERGROUP();
}
void
RenderDebugShit(void)
{
+ PUSH_RENDERGROUP("RenderDebugShit");
CTheScripts::RenderTheScriptDebugLines();
#ifndef FINAL
if(gbShowCollisionLines)
@@ -1408,6 +1415,7 @@ RenderDebugShit(void)
CDebug::DrawLines();
DefinedState();
#endif
+ POP_RENDERGROUP();
}
void
@@ -1419,6 +1427,7 @@ RenderEffects(void)
return;
}
#endif
+ PUSH_RENDERGROUP("RenderEffects");
CGlass::Render();
CWaterCannons::Render();
CSpecialFX::Render();
@@ -1434,11 +1443,13 @@ RenderEffects(void)
CPointLights::RenderFogEffect();
CMovingThings::Render();
CRenderer::RenderFirstPersonVehicle();
+ POP_RENDERGROUP();
}
void
Render2dStuff(void)
{
+ PUSH_RENDERGROUP("Render2dStuff");
RwRenderStateSet(rwRENDERSTATEZTESTENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEZWRITEENABLE, (void*)FALSE);
RwRenderStateSet(rwRENDERSTATEVERTEXALPHAENABLE, (void*)TRUE);
@@ -1504,6 +1515,7 @@ Render2dStuff(void)
#ifdef DEBUGMENU
DebugMenuRender();
#endif
+ POP_RENDERGROUP();
}
void
@@ -1511,21 +1523,25 @@ RenderMenus(void)
{
if (FrontEndMenuManager.m_bMenuActive)
{
+ PUSH_RENDERGROUP("RenderMenus");
PUSH_MEMID(MEMID_FRONTEND);
FrontEndMenuManager.DrawFrontEnd();
POP_MEMID();
+ POP_RENDERGROUP();
}
}
void
Render2dStuffAfterFade(void)
{
+ PUSH_RENDERGROUP("Render2dStuffAfterFade");
#ifndef MASTER
DisplayGameDebugText();
#endif
CHud::DrawAfterFade();
CFont::DrawFonts();
+ POP_RENDERGROUP();
}
void
diff --git a/src/core/main.h b/src/core/main.h
index 9f181101..787d4f52 100644
--- a/src/core/main.h
+++ b/src/core/main.h
@@ -1,5 +1,11 @@
#pragma once
+#if defined(RW_OPENGL)
+#define PUSH_RENDERGROUP(str) glPushDebugGroup(GL_DEBUG_SOURCE_APPLICATION, 0, -1, str)
+#define POP_RENDERGROUP() glPopDebugGroup()
+#else
+#endif
+
struct GlobalScene
{
RpWorld *world;