Adds more trace scopes to get a better look at the internals of render_frame

Author: The-E

code/nebula/neb.cpp

@@ -24,6 +24,7 @@
 #include "ship/ship.h"
 #include "starfield/starfield.h"
 #include "tgautils/tgautils.h"
+#include "tracing/tracing.h"
 
 
 // --------------------------------------------------------------------------------------------------------
@@ -455,6 +456,9 @@ void neb2_level_close()
 // call before beginning all rendering
 void neb2_render_setup(camid cid)
 {
+	GR_DEBUG_SCOPE("Nebula Setup");
+	TRACE_SCOPE(tracing::SetupNebula);
+
 	// standalone servers can bail here
 	if (Game_mode & GM_STANDALONE_SERVER) {
 		return;

code/particle/particle.cpp

@@ -340,6 +340,7 @@ namespace particle
 
 	void render_all()
 	{
+		GR_DEBUG_SCOPE("Render Particles");
 		TRACE_SCOPE(tracing::ParticlesRenderAll);
 
 		ubyte flags;

code/ship/shield.cpp

@@ -24,6 +24,7 @@
 #include "ship/ship.h"
 #include "species_defs/species_defs.h"
 #include "tracing/Monitor.h"
+#include "tracing/tracing.h"
 
 int	Show_shield_mesh = 0;
 
@@ -523,6 +524,9 @@ void render_shield(int shield_num)
  */
 void render_shields()
 {
+	GR_DEBUG_SCOPE("Render Shields");
+	TRACE_SCOPE(tracing::DrawShields);
+
 	int	i;
 
 	if (Detail.shield_effects == 0){

code/starfield/starfield.cpp

@@ -28,6 +28,7 @@
 #include "starfield/nebula.h"
 #include "starfield/starfield.h"
 #include "starfield/supernova.h"
+#include "tracing/tracing.h"
 
 #define MAX_DEBRIS_VCLIPS			4
 #define DEBRIS_ROT_MIN				10000
@@ -1038,6 +1039,9 @@ void stars_get_sun_pos(int sun_n, vec3d *pos)
 // draw sun
 void stars_draw_sun(int show_sun)
 {	
+	GR_DEBUG_SCOPE("Draw Suns");
+	TRACE_SCOPE(tracing::DrawSuns);
+
 	int idx;
 	vec3d sun_pos;
 	vec3d sun_dir;
@@ -1248,6 +1252,9 @@ void stars_draw_sun_glow(int sun_n)
 
 void stars_draw_bitmaps(int show_bitmaps)
 {
+	GR_DEBUG_SCOPE("Draw Bitmaps");
+	TRACE_SCOPE(tracing::DrawBitmaps);
+
 	int idx;
 	int star_index;
 
@@ -1504,6 +1511,9 @@ void subspace_render()
 
 void stars_draw_stars()
 {
+	GR_DEBUG_SCOPE("Draw Starfield");
+	TRACE_SCOPE(tracing::DrawStarfield);
+
 	int i;
 	star *sp;
 	float dist = 0.0f;
@@ -1608,6 +1618,9 @@ void stars_draw_stars()
 
 void stars_draw_debris()
 {
+	GR_DEBUG_SCOPE("Draw motion debris");
+	TRACE_SCOPE(tracing::DrawMotionDebris);
+
 	int i;
 	float vdist;
 	vec3d tmp;
@@ -1688,6 +1701,9 @@ void stars_draw_debris()
 
 void stars_draw(int show_stars, int show_suns, int show_nebulas, int show_subspace, int env)
 {
+	GR_DEBUG_SCOPE("Draw Stars");
+	TRACE_SCOPE(tracing::DrawStars);
+
 	int gr_zbuffering_save = gr_zbuffer_get();
 	gr_zbuffer_set(GR_ZBUFF_NONE);
 
@@ -2028,6 +2044,9 @@ void stars_page_in()
 // background nebula models and planets
 void stars_draw_background()
 {	
+	GR_DEBUG_SCOPE("Draw Background");
+	TRACE_SCOPE(tracing::DrawBackground);
+
 	if (Nmodel_num < 0)
 		return;
 

code/tracing/categories.cpp

@@ -50,6 +50,15 @@ Category QueueRender("Queue Render", false);
 Category SubmitDraws("Submit Draws", true);
 Category ApplyLights("Apply Lights", true);
 Category DrawEffects("Draw Effects", true);
+Category SetupNebula("Setup Nebula", true);
+Category DrawStars("Draw Stars", true);
+Category DrawShields("Draw Shields", true);
+Category DrawBeams("Draw Beams", true);
+Category DrawStarfield("Draw Starfield", true);
+Category DrawMotionDebris("Draw Motion debris", true);
+Category DrawBackground("Draw Background", true);
+Category DrawSuns("Draw Suns", true);
+Category DrawBitmaps("Draw Bitmaps", true);
 
 Category RepeatingEvents("Repeating events", false);
 Category NonrepeatingEvents("Nonrepeating events", false);

code/tracing/categories.h

@@ -62,6 +62,15 @@ extern Category QueueRender;
 extern Category SubmitDraws;
 extern Category ApplyLights;
 extern Category DrawEffects;
+extern Category SetupNebula;
+extern Category DrawStars;
+extern Category DrawShields;
+extern Category DrawBeams;
+extern Category DrawStarfield;
+extern Category DrawMotionDebris;
+extern Category DrawBackground;
+extern Category DrawSuns;
+extern Category DrawBitmaps;
 
 extern Category RepeatingEvents;
 extern Category NonrepeatingEvents;

code/weapon/beam.cpp

@@ -40,6 +40,7 @@
 #include "weapon/beam.h"
 #include "weapon/weapon.h"
 #include "globalincs/globals.h"
+#include "tracing/tracing.h"
 
 // ------------------------------------------------------------------------------------------------
 // BEAM WEAPON DEFINES/VARS
@@ -1517,6 +1518,9 @@ void beam_render_muzzle_glow(beam *b)
 // render all beam weapons
 void beam_render_all()
 {
+	GR_DEBUG_SCOPE("Render Beams");
+	TRACE_SCOPE(tracing::DrawBeams);
+
 	beam *moveup;	
 
 	// moves the U value of texture coods in beams if desired-Bobboau

code/weapon/trails.cpp

@@ -383,6 +383,7 @@ void trail_object_died( trail *trailp )
 
 void trail_render_all()
 {
+	GR_DEBUG_SCOPE("Render trails");
 	TRACE_SCOPE(tracing::RenderTrails);
 
 	// No trails at slot 0