@itwin/core-frontend 5.14.0-dev.14 → 5.14.0-dev.15

package/lib/esm/internal/render/webgl/SceneCompositor.js

@@ -227,8 +227,8 @@ class FrameBuffers {
     idsAndZComposite;
     idsAndAltZComposite;
     edlDrawCol;
-    init(textures, depth, depthMS) {
-        if (!this.initPotentialMSFbos(textures, depth, depthMS))
+    init(textures, depth, depthMS, boundColor) {
+        if (!this.initPotentialMSFbos(textures, depth, depthMS, boundColor))
             return false;
         this.depthAndOrder = FrameBuffer.create([expectDefined(textures.depthAndOrder)], depth);
         this.hilite = FrameBuffer.create([expectDefined(textures.hilite)], depth);
@@ -236,7 +236,7 @@ class FrameBuffers {
         if (!this.depthAndOrder || !this.hilite || !this.hiliteUsingStencil)
             return false;
         assert(undefined === this.opaqueAll);
-        if (!this.initPotentialMSMRTFbos(textures, depth, depthMS))
+        if (!this.initPotentialMSMRTFbos(textures, depth, depthMS, boundColor))
             return false;
         assert(undefined !== textures.accumulation && undefined !== textures.revealage);
         const colors = [textures.accumulation, textures.revealage];
@@ -253,9 +253,8 @@ class FrameBuffers {
             && undefined !== this.clearTranslucent
             && undefined !== this.pingPong;
     }
-    initPotentialMSFbos(textures, depth, depthMS) {
-        const boundColor = System.instance.frameBufferStack.currentColorBuffer;
-        assert(undefined !== boundColor && undefined !== textures.color);
+    initPotentialMSFbos(textures, depth, depthMS, boundColor) {
+        assert(undefined !== textures.color);
         if (undefined === depthMS) {
             this.opaqueColor = FrameBuffer.create([boundColor], depth);
             this.opaqueAndCompositeColor = FrameBuffer.create([textures.color], depth);
@@ -268,10 +267,8 @@ class FrameBuffers {
         return undefined !== this.opaqueColor
             && undefined !== this.opaqueAndCompositeColor;
     }
-    initPotentialMSMRTFbos(textures, depth, depthMs) {
-        const boundColor = System.instance.frameBufferStack.currentColorBuffer;
-        assert(undefined !== boundColor &&
-            undefined !== textures.color &&
+    initPotentialMSMRTFbos(textures, depth, depthMs, boundColor) {
+        assert(undefined !== textures.color &&
             undefined !== textures.featureId &&
             undefined !== textures.depthAndOrder &&
             undefined !== textures.accumulation &&
@@ -385,23 +382,23 @@ class FrameBuffers {
             this.idsAndAltZComposite = dispose(this.idsAndAltZComposite);
         }
     }
-    enableMultiSampling(textures, depth, depthMS) {
+    enableMultiSampling(textures, depth, depthMS, boundColor) {
         this.opaqueColor = dispose(this.opaqueColor);
         this.opaqueAndCompositeColor = dispose(this.opaqueAndCompositeColor);
-        let rVal = this.initPotentialMSFbos(textures, depth, depthMS);
+        let rVal = this.initPotentialMSFbos(textures, depth, depthMS, boundColor);
         this.opaqueAll = dispose(this.opaqueAll);
         this.opaqueAndCompositeAll = dispose(this.opaqueAndCompositeAll);
-        rVal = this.initPotentialMSMRTFbos(textures, depth, depthMS);
+        rVal = this.initPotentialMSMRTFbos(textures, depth, depthMS, boundColor);
         return rVal;
     }
-    disableMultiSampling(textures, depth) {
+    disableMultiSampling(textures, depth, boundColor) {
         this.opaqueAll = dispose(this.opaqueAll);
         this.opaqueAndCompositeAll = dispose(this.opaqueAndCompositeAll);
-        if (!this.initPotentialMSMRTFbos(textures, depth, undefined))
+        if (!this.initPotentialMSMRTFbos(textures, depth, undefined, boundColor))
             return false;
         this.opaqueColor = dispose(this.opaqueColor);
         this.opaqueAndCompositeColor = dispose(this.opaqueAndCompositeColor);
-        return this.initPotentialMSFbos(textures, depth, undefined);
+        return this.initPotentialMSFbos(textures, depth, undefined, boundColor);
     }
     get isDisposed() {
         return undefined === this.opaqueColor && undefined === this.opaqueAndCompositeColor && undefined === this.depthAndOrder
@@ -1444,7 +1441,7 @@ class Compositor extends SceneCompositor {
             this._depthMS = undefined;
         if (this._depth !== undefined) {
             return this._textures.init(this._width, this._height, this._antialiasSamples)
-                && this._fbos.init(this._textures, this._depth, this._depthMS)
+                && this._fbos.init(this._textures, this._depth, this._depthMS, expectDefined(this.target.outputColorTexture))
                 && this._geom.init(this._textures)
                 && this.eyeDomeLighting.init(this._width, this._height, this._depth);
         }
@@ -1459,11 +1456,11 @@ class Compositor extends SceneCompositor {
         if (!this._textures.enableMultiSampling(this._width, this._height, this._antialiasSamples))
             return false;
         assert(undefined !== this._depth && undefined !== this._depthMS);
-        return this._fbos.enableMultiSampling(this._textures, this._depth, this._depthMS);
+        return this._fbos.enableMultiSampling(this._textures, this._depth, this._depthMS, expectDefined(this.target.outputColorTexture));
     }
     disableMultiSampling() {
         assert(undefined !== this._depth);
-        if (!this._fbos.disableMultiSampling(this._textures, this._depth))
+        if (!this._fbos.disableMultiSampling(this._textures, this._depth, expectDefined(this.target.outputColorTexture)))
             return false;
         // Want to disable multisampling without deleting & reallocating other stuff.
         this._depthMS = dispose(this._depthMS);