more cleanup + fixes for multiview

Author: cabanier

src/core/RenderTarget.js

@@ -35,6 +35,7 @@ class RenderTarget extends EventDispatcher {
 	 * @property {?Texture} [depthTexture=null] - Reference to a depth texture.
 	 * @property {number} [samples=0] - The MSAA samples count.
 	 * @property {number} [count=1] - Defines the number of color attachments . Must be at least `1`.
+	 * @property {boolean} [multiview=false] - Whether this target is used for multiview rendering.
 	 */
 
 	/**
@@ -119,7 +120,8 @@ class RenderTarget extends EventDispatcher {
 			resolveStencilBuffer: true,
 			depthTexture: null,
 			samples: 0,
-			count: 1
+			count: 1,
+			multiview: false
 		}, options );
 
 		const texture = new Texture( image, options.mapping, options.wrapS, options.wrapT, options.magFilter, options.minFilter, options.format, options.type, options.anisotropy, options.colorSpace );
@@ -189,6 +191,14 @@ class RenderTarget extends EventDispatcher {
 		 */
 		this.samples = options.samples;
 
+		/**
+		 * Whether to this target is used in multiview rendering.
+		 *
+		 * @type {boolean}
+		 * @default false
+		 */
+		this.multiview = options.multiview;
+
 	}
 
 	/**

src/renderers/common/Renderer.js

@@ -1202,6 +1202,7 @@ class Renderer {
 		frameBufferTarget.viewport.multiplyScalar( this._pixelRatio );
 		frameBufferTarget.scissor.multiplyScalar( this._pixelRatio );
 		frameBufferTarget.scissorTest = this._scissorTest;
+		frameBufferTarget.multiview = outputRenderTarget !== null ? outputRenderTarget.multiview : false;
 
 		return frameBufferTarget;
 

src/renderers/common/Textures.js

@@ -77,7 +77,7 @@ class Textures extends DataMap {
 
 		if ( depthTexture === undefined && useDepthTexture ) {
 
-			if ( size.depth > 1 ) {
+			if ( renderTarget.multiview === true && size.depth > 1 ) {
 
 				depthTexture = new DepthArrayTexture();
 
@@ -147,7 +147,7 @@ class Textures extends DataMap {
 
 				const texture = textures[ i ];
 
-				texture.isTextureArray = this.renderer.xr.useMultiview() === true && size.depth > 1;
+				texture.isTextureArray = renderTarget.multiview === true && size.depth > 1;
 				if ( textureNeedsUpdate ) texture.needsUpdate = true;
 
 				this.updateTexture( texture, options );

src/renderers/common/XRManager.js

@@ -901,11 +901,11 @@ class XRManager extends EventDispatcher {
 						samples: attributes.antialias ? 4 : 0,
 						resolveDepthBuffer: ( glProjLayer.ignoreDepthValues === false ),
 						resolveStencilBuffer: ( glProjLayer.ignoreDepthValues === false ),
-						depth: this._useMultiview ? 2 : 1
+						depth: this._useMultiview ? 2 : 1,
+						multiview: this._useMultiview
 					} );
 
 				this._xrRenderTarget.hasExternalTextures = true;
-				this._xrRenderTarget.useMultiview = this._useMultiview;
 				this._xrRenderTarget.depth = this._useMultiview ? 2 : 1;
 
 				this._referenceSpace = await session.requestReferenceSpace( this.getReferenceSpaceType() );

src/renderers/common/XRRenderTarget.js

@@ -55,14 +55,6 @@ class XRRenderTarget extends RenderTarget {
 		 */
 		this.autoAllocateDepthBuffer = true;
 
-		/**
-		 * Whether this render target is used with multiview rendering or not.
-		 *
-		 * @type {boolean}
-		 * @default false
-		 */
-		this.useMultiview = false;
-
 	}
 
 	copy( source ) {

src/renderers/common/nodes/Nodes.js

@@ -202,7 +202,7 @@ class Nodes extends DataMap {
 				nodeBuilder.environmentNode = this.getEnvironmentNode( renderObject.scene );
 				nodeBuilder.fogNode = this.getFogNode( renderObject.scene );
 				nodeBuilder.clippingContext = renderObject.clippingContext;
-				if ( this.renderer.xr.useMultiview() ) {
+				if ( this.renderer.getRenderTarget() ? this.renderer.getRenderTarget().multiview : false ) {
 
 					nodeBuilder.enableMultiview();
 

src/renderers/webgl-fallback/WebGLBackend.js

@@ -361,7 +361,7 @@ class WebGLBackend extends Backend {
 
 			// The multisample_render_to_texture extension doesn't work properly if there
 			// are midframe flushes and an external depth texture.
-			if ( ( this.extensions.has( 'WEBGL_multisampled_render_to_texture' ) === true ) && renderTarget.autoAllocateDepthBuffer === true && renderTarget.useMultiview === false ) {
+			if ( ( this.extensions.has( 'WEBGL_multisampled_render_to_texture' ) === true ) && renderTarget.autoAllocateDepthBuffer === true && renderTarget.multiview === false ) {
 
 				console.warn( 'THREE.WebGLBackend: Render-to-texture extension was disabled because an external texture was provided' );
 
@@ -2062,7 +2062,7 @@ class WebGLBackend extends Backend {
 
 						} else {
 
-							if ( this.renderer.xr.useMultiview() ) {
+							if ( renderTarget.multiview ) {
 
 								multiviewExt.framebufferTextureMultisampleMultiviewOVR( gl.FRAMEBUFFER, attachment, textureData.textureGPU, 0, samples, 0, 2 );
 
@@ -2099,7 +2099,7 @@ class WebGLBackend extends Backend {
 						textureData.renderTarget = descriptor.renderTarget;
 						textureData.cacheKey = cacheKey; // required for copyTextureToTexture()
 
-						if ( this.renderer.xr.useMultiview() ) {
+						if ( renderTarget.multiview ) {
 
 							multiviewExt.framebufferTextureMultisampleMultiviewOVR( gl.FRAMEBUFFER, depthStyle, textureData.textureGPU, 0, samples, 0, 2 );
 
@@ -2151,15 +2151,15 @@ class WebGLBackend extends Backend {
 
 				// rebind external XR textures
 
-				if ( ( isXRRenderTarget && hasExternalTextures ) || this.renderer.xr.useMultiview() ) {
+				if ( ( isXRRenderTarget && hasExternalTextures ) || renderTarget.multiview ) {
 
 					state.bindFramebuffer( gl.FRAMEBUFFER, fb );
 
 					// rebind color
 
 					const textureData = this.get( descriptor.textures[ 0 ] );
 
-					if ( this.renderer.xr.useMultiview() ) {
+					if ( renderTarget.multiview ) {
 
 						multiviewExt.framebufferTextureMultisampleMultiviewOVR( gl.FRAMEBUFFER, gl.COLOR_ATTACHMENT0, textureData.textureGPU, 0, samples, 0, 2 );
 
@@ -2187,7 +2187,7 @@ class WebGLBackend extends Backend {
 
 						const textureData = this.get( descriptor.depthTexture );
 
-						if ( this.renderer.xr.useMultiview() ) {
+						if ( renderTarget.multiview ) {
 
 							multiviewExt.framebufferTextureMultisampleMultiviewOVR( gl.FRAMEBUFFER, depthStyle, textureData.textureGPU, 0, samples, 0, 2 );
 
@@ -2207,7 +2207,7 @@ class WebGLBackend extends Backend {
 
 			}
 
-			if ( samples > 0 && useMultisampledRTT === false && ! this.renderer.xr.useMultiview() ) {
+			if ( samples > 0 && useMultisampledRTT === false && ! renderTarget.multiview ) {
 
 				if ( msaaFb === undefined ) {
 
@@ -2502,7 +2502,7 @@ class WebGLBackend extends Backend {
 	 */
 	_useMultisampledExtension( renderTarget ) {
 
-		if ( renderTarget.useMultiview === true ) {
+		if ( renderTarget.multiview === true ) {
 
 			return true;
 

src/renderers/webgl-fallback/nodes/GLSLNodeBuilder.js

@@ -557,7 +557,11 @@ ${ flowData.code }
 
 				}
 
-				if ( texture.compareFunction ) {
+				if ( uniform.type === 'texture3D' && texture.isTextureArray === false ) {
+
+					snippet = `${typePrefix}sampler3D ${ uniform.name };`;
+
+				} else if ( texture.compareFunction ) {
 
 					if ( texture.isDepthArrayTexture === true ) {
 
@@ -569,10 +573,6 @@ ${ flowData.code }
 
 					}
 
-				} else if ( uniform.type === 'texture3D' && texture.isTextureArray === false ) {
-
-					snippet = `${typePrefix}sampler3D ${ uniform.name };`;
-
 				} else if ( texture.isDataArrayTexture === true || texture.isCompressedArrayTexture === true || texture.isTextureArray === true ) {
 
 					snippet = `${typePrefix}sampler2DArray ${ uniform.name };`;