@itwin/core-frontend 3.1.0-dev.15 → 3.1.0-dev.22

package/lib/cjs/render/webgl/SceneCompositor.js

@@ -1677,12 +1677,14 @@ class MRTCompositor extends Compositor {
         });
     }
     renderOpaque(commands, compositeFlags, renderForReadPixels) {
-        // Output the first 2 passes to color and pick data buffers. (All 3 in the case of rendering for readPixels()).
-        this._readPickDataFromPingPong = true;
         const needComposite = 0 /* None */ !== compositeFlags;
         const needAO = 0 /* None */ !== (compositeFlags & 4 /* AmbientOcclusion */);
         const fbStack = System_1.System.instance.frameBufferStack;
-        fbStack.execute(needComposite ? this._fbos.opaqueAndCompositeAll : this._fbos.opaqueAll, true, this.useMsBuffers, () => {
+        // Output the first 2 passes to color and pick data buffers. (All 3 in the case of rendering for readPixels() or ambient occlusion).
+        let fbo = (needComposite ? this._fbos.opaqueAndCompositeAll : this._fbos.opaqueAll);
+        const useMsBuffers = fbo.isMultisampled && this.useMsBuffers;
+        this._readPickDataFromPingPong = !useMsBuffers; // if multisampling then can read pick textures directly.
+        fbStack.execute(fbo, true, useMsBuffers, () => {
             this.drawPass(commands, 2 /* OpaqueLinear */);
             this.drawPass(commands, 3 /* OpaquePlanar */, true);
             if (needAO || renderForReadPixels) {
@@ -1690,33 +1692,32 @@ class MRTCompositor extends Compositor {
                     this._primitiveDrawState = PrimitiveDrawState.Pickable;
                 this.drawPass(commands, 4 /* OpaqueGeneral */, true);
                 this._primitiveDrawState = PrimitiveDrawState.Both;
-                if (this.useMsBuffers) {
-                    const fbo = (needComposite ? this._fbos.opaqueAndCompositeAll : this._fbos.opaqueAll);
+                if (useMsBuffers)
                     fbo.blitMsBuffersToTextures(true);
-                }
             }
         });
         this._readPickDataFromPingPong = false;
         // The general pass (and following) will not bother to write to pick buffers and so can read from the actual pick buffers.
         if (!renderForReadPixels) {
-            fbStack.execute(needComposite ? this._fbos.opaqueAndCompositeColor : this._fbos.opaqueColor, true, this.useMsBuffers, () => {
+            fbo = (needComposite ? this._fbos.opaqueAndCompositeColor : this._fbos.opaqueColor);
+            fbStack.execute(fbo, true, useMsBuffers, () => {
                 if (needAO)
                     this._primitiveDrawState = PrimitiveDrawState.NonPickable;
                 this.drawPass(commands, 4 /* OpaqueGeneral */, false);
                 this._primitiveDrawState = PrimitiveDrawState.Both;
                 this.drawPass(commands, 8 /* HiddenEdge */, false);
             });
-            if (this.useMsBuffers) {
-                const fbo = (needComposite ? this._fbos.opaqueAndCompositeColor : this._fbos.opaqueColor);
+            if (useMsBuffers)
                 fbo.blitMsBuffersToTextures(needComposite);
-            }
         }
         if (needAO)
             this.renderAmbientOcclusion();
     }
     renderLayers(commands, needComposite, pass) {
-        this._readPickDataFromPingPong = true;
-        System_1.System.instance.frameBufferStack.execute(needComposite ? this._fbos.opaqueAndCompositeAll : this._fbos.opaqueAll, true, 1 /* OpaqueLayers */ === pass && this.useMsBuffers, () => {
+        const fbo = (needComposite ? this._fbos.opaqueAndCompositeAll : this._fbos.opaqueAll);
+        const useMsBuffers = 1 /* OpaqueLayers */ === pass && fbo.isMultisampled && this.useMsBuffers;
+        this._readPickDataFromPingPong = !useMsBuffers;
+        System_1.System.instance.frameBufferStack.execute(fbo, true, useMsBuffers, () => {
             this.drawPass(commands, pass, true);
         });
         this._readPickDataFromPingPong = false;
@@ -1762,7 +1763,7 @@ class MRTCompositor extends Compositor {
     }
     pingPong() {
         if (this._fbos.opaqueAll.isMultisampled && this.useMsBuffers) {
-            // If we are multisampling we can just blit the FeatureId and DepthAndOrder buffers to their textures.
+            // If we are multisampling we can just blit the FeatureId and DepthAndOrder MS buffers to their textures.
             this._fbos.opaqueAll.blitMsBuffersToTextures(false, 1);
             this._fbos.opaqueAll.blitMsBuffersToTextures(false, 2);
         }