[Fix] Small fix to just introduced issue with MRT (#6947)

* [Fix] Small fix to just introduced issue with MRT * logging --------- Co-authored-by: Martin Valigursky <[email protected]>
playcanvas · Sep 11, 2024 · 09901d1 · 09901d1
1 parent af325c8
commit 09901d1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/platform/graphics/render-target.js b/src/platform/graphics/render-target.js
@@ -136,7 +136,7 @@ class RenderTarget {
         this.id = id++;
 
         // device, from one of the buffers
-        const device = options.colorBuffer?.device || options.depthBuffer?.device || options.graphicsDevice;
+        const device = options.colorBuffer?.device ?? options.colorBuffers?.[0].device ?? options.depthBuffer?.device ?? options.graphicsDevice;
         Debug.assert(device, 'Failed to obtain the device, colorBuffer nor depthBuffer store it.');
         this._device = device;
 

diff --git a/src/platform/graphics/webgl/webgl-graphics-device.js b/src/platform/graphics/webgl/webgl-graphics-device.js
@@ -1149,14 +1149,14 @@ class WebglGraphicsDevice extends GraphicsDevice {
      */
     startRenderPass(renderPass) {
 
-        DebugGraphics.pushGpuMarker(this, `Pass:${renderPass.name}`);
-        DebugGraphics.pushGpuMarker(this, 'START-PASS');
-
         // set up render target
         const rt = renderPass.renderTarget ?? this.backBuffer;
         this.renderTarget = rt;
         Debug.assert(rt);
 
+        DebugGraphics.pushGpuMarker(this, `Pass:${renderPass.name} RT:${rt.name}`);
+        DebugGraphics.pushGpuMarker(this, 'START-PASS');
+
         this.updateBegin();
 
         // the pass always start using full size of the target

diff --git a/src/platform/graphics/webgpu/webgpu-graphics-device.js b/src/platform/graphics/webgpu/webgpu-graphics-device.js
@@ -679,7 +679,7 @@ class WebgpuGraphicsDevice extends GraphicsDevice {
         DebugHelper.setLabel(this.passEncoder, renderPass.name);
 
         // push marker to the passEncoder
-        DebugGraphics.pushGpuMarker(this, `Pass:${renderPass.name}`);
+        DebugGraphics.pushGpuMarker(this, `Pass:${renderPass.name} RT:${rt.name}`);
 
         this.setupPassEncoderDefaults();
 

diff --git a/src/scene/graphics/render-pass-quad.js b/src/scene/graphics/render-pass-quad.js
@@ -17,7 +17,7 @@ class RenderPassQuad extends RenderPass {
 
     execute() {
         const { device } = this;
-        DebugGraphics.pushGpuMarker(device, 'drawQuadWithShader');
+        DebugGraphics.pushGpuMarker(device, `${this.name}:${this.quad.shader.name}`);
 
         device.setCullMode(CULLFACE_NONE);
         device.setDepthState(DepthState.NODEPTH);