small cleanups (playcanvas#2897)

mvaligursky · web-flow · commit ed5894682aa5 · 2021-02-22T14:56:51.000Z
diff --git a/src/graphics/transform-feedback.js b/src/graphics/transform-feedback.js
@@ -131,9 +131,10 @@ class TransformFeedback {
         var device = this.device;
 
         // #ifdef DEBUG
-        this.device.pushMarker("TransformFeedback");
+        device.pushMarker("TransformFeedback");
         // #endif
 
+        const oldRt = device.getRenderTarget();
         device.setRenderTarget(null);
         device.updateBegin();
         device.setVertexBuffer(this._inputBuffer, 0);
@@ -149,9 +150,10 @@ class TransformFeedback {
         device.setTransformFeedbackBuffer(null);
         device.setRaster(true);
         device.updateEnd();
+        device.setRenderTarget(oldRt);
 
         // #ifdef DEBUG
-        this.device.popMarker();
+        device.popMarker();
         // #endif
 
         // swap buffers
diff --git a/src/scene/forward-renderer.js b/src/scene/forward-renderer.js
@@ -3039,8 +3039,8 @@ class ForwardRenderer {
             camera = layer.cameras[cameraPass];
 
             // #ifdef DEBUG
-            this.device.pushMarker(layer.name);
             this.device.pushMarker(camera ? camera.entity.name : "noname");
+            this.device.pushMarker(layer.name);
             // #endif
 
             // #ifdef PROFILER
diff --git a/src/scene/layer-composition.js b/src/scene/layer-composition.js
@@ -517,7 +517,7 @@ class LayerComposition extends EventHandler {
 
         // #ifdef DEBUG
         if (this.logRenderActions) {
-            console.log("Render Actions");
+            console.log("Render Actions for composition: " + this.name);
             for (let i = 0; i < this._renderActions.length; i++) {
                 const ra = this._renderActions[i];
                 const layerIndex = ra.layerIndex;
