Expose node names to Spector captures in debug mode (playcanvas#3300)

mvaligursky · Martin Valigursky · web-flow · commit 1ad06f47b74b · 2021-07-06T04:41:29.000-07:00
Co-authored-by: Martin Valigursky &lt;mvaligursky@snapchat.com&gt;
diff --git a/src/framework/components/camera/post-effect-queue.js b/src/framework/components/camera/post-effect-queue.js
@@ -312,12 +312,12 @@ class PostEffectQueue {
                             fx.effect.render(fx.inputTarget, destTarget, rect);
 
                             // #if _DEBUG
-                            self.app.graphicsDevice.popMarker("");
+                            self.app.graphicsDevice.popMarker();
                             // #endif
                         }
 
                         // #if _DEBUG
-                        self.app.graphicsDevice.popMarker("");
+                        self.app.graphicsDevice.popMarker();
                         // #endif
                     }
                 }
diff --git a/src/graphics/reproject-texture.js b/src/graphics/reproject-texture.js
@@ -137,7 +137,7 @@ function reprojectTexture(source, target, options = {}) {
     }
 
     // #if _DEBUG
-    device.popMarker("");
+    device.popMarker();
     // #endif
 }
 
diff --git a/src/scene/morph-instance.js b/src/scene/morph-instance.js
@@ -295,7 +295,7 @@ class MorphInstance {
         }
 
         // #if _DEBUG
-        device.popMarker("");
+        device.popMarker();
         // #endif
     }
 
diff --git a/src/scene/particle-system/gpu-updater.js b/src/scene/particle-system/gpu-updater.js
@@ -193,7 +193,7 @@ class ParticleGPUUpdater {
             this._setInputBounds();
 
         // #if _DEBUG
-        device.popMarker("");
+        device.popMarker();
         // #endif
     }
 }
diff --git a/src/scene/renderer/forward-renderer.js b/src/scene/renderer/forward-renderer.js
@@ -1023,6 +1023,11 @@ class ForwardRenderer {
 
     // returns number of extra draw calls to skip - used to skip auto instanced meshes draw calls. by default return 0 to not skip any additional draw calls
     drawInstance(device, meshInstance, mesh, style, normal) {
+
+        // #if _DEBUG
+        device.pushMarker(meshInstance.node.name);
+        // #endif
+
         instancingData = meshInstance.instancingData;
         if (instancingData) {
             if (instancingData.count > 0) {
@@ -1051,11 +1056,21 @@ class ForwardRenderer {
 
             device.draw(mesh.primitive[style]);
         }
+
+        // #if _DEBUG
+        device.popMarker();
+        // #endif
+
         return 0;
     }
 
     // used for stereo
     drawInstance2(device, meshInstance, mesh, style) {
+
+        // #if _DEBUG
+        device.pushMarker(meshInstance.node.name);
+        // #endif
+
         instancingData = meshInstance.instancingData;
         if (instancingData) {
             if (instancingData.count > 0) {
@@ -1071,6 +1086,11 @@ class ForwardRenderer {
             // matrices are already set
             device.draw(mesh.primitive[style], undefined, true);
         }
+
+        // #if _DEBUG
+        device.popMarker();
+        // #endif
+
         return 0;
     }
 
diff --git a/src/scene/scene.js b/src/scene/scene.js
@@ -430,7 +430,7 @@ class Scene extends EventHandler {
 
             var skyLayer = this.layers.getLayerById(LAYERID_SKYBOX);
             if (skyLayer) {
-                var node = new GraphNode();
+                var node = new GraphNode("Skybox");
                 var mesh = createBox(device);
                 var meshInstance = new MeshInstance(mesh, material, node);
                 meshInstance.cull = false;

Original file line number	Diff line number	Diff line change
`@@ -312,12 +312,12 @@ class PostEffectQueue {`
`312`	`312`	`fx.effect.render(fx.inputTarget, destTarget, rect);`
`313`	`313`
`314`	`314`	`// #if _DEBUG`
`315`		`- self.app.graphicsDevice.popMarker("");`
	`315`	`+ self.app.graphicsDevice.popMarker();`
`316`	`316`	`// #endif`
`317`	`317`	`}`
`318`	`318`
`319`	`319`	`// #if _DEBUG`
`320`		`- self.app.graphicsDevice.popMarker("");`
	`320`	`+ self.app.graphicsDevice.popMarker();`
`321`	`321`	`// #endif`
`322`	`322`	`}`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ function reprojectTexture(source, target, options = {}) {`
`137`	`137`	`}`
`138`	`138`
`139`	`139`	`// #if _DEBUG`
`140`		`- device.popMarker("");`
	`140`	`+ device.popMarker();`
`141`	`141`	`// #endif`
`142`	`142`	`}`
`143`	`143`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ class MorphInstance {`
`295`	`295`	`}`
`296`	`296`
`297`	`297`	`// #if _DEBUG`
`298`		`- device.popMarker("");`
	`298`	`+ device.popMarker();`
`299`	`299`	`// #endif`
`300`	`300`	`}`
`301`	`301`
Original file line number	Diff line number	Diff line change
`@@ -193,7 +193,7 @@ class ParticleGPUUpdater {`
`193`	`193`	`this._setInputBounds();`
`194`	`194`
`195`	`195`	`// #if _DEBUG`
`196`		`- device.popMarker("");`
	`196`	`+ device.popMarker();`
`197`	`197`	`// #endif`
`198`	`198`	`}`
`199`	`199`	`}`