Skip to content

Commit 0f11226

Browse files
committed
Move more logic to resolveDepthBuffer
1 parent 008362f commit 0f11226

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

src/renderers/WebGLRenderer.js

Lines changed: 7 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2237,26 +2237,21 @@ class WebGLRenderer {
22372237

22382238
this.setRenderTargetTextures = function ( renderTarget, colorTexture, depthTexture ) {
22392239

2240-
properties.get( renderTarget.texture ).__webglTexture = colorTexture;
2241-
properties.get( renderTarget.depthTexture ).__webglTexture = depthTexture;
2242-
22432240
const renderTargetProperties = properties.get( renderTarget );
2244-
renderTargetProperties.__hasExternalTextures = true;
22452241

2246-
renderTargetProperties.__autoAllocateDepthBuffer = depthTexture === undefined;
2247-
2248-
if ( ! renderTargetProperties.__autoAllocateDepthBuffer ) {
2242+
renderTargetProperties.__autoAllocateDepthBuffer = renderTarget.resolveDepthBuffer === false;
2243+
if ( renderTargetProperties.__autoAllocateDepthBuffer === false ) {
22492244

22502245
// The multisample_render_to_texture extension doesn't work properly if there
22512246
// are midframe flushes and an external depth buffer. Disable use of the extension.
2252-
if ( extensions.has( 'WEBGL_multisampled_render_to_texture' ) === true ) {
2247+
renderTargetProperties.__useRenderToTexture = false;
22532248

2254-
console.warn( 'THREE.WebGLRenderer: Render-to-texture extension was disabled because an external texture was provided' );
2255-
renderTargetProperties.__useRenderToTexture = false;
2249+
}
22562250

2257-
}
2251+
properties.get( renderTarget.texture ).__webglTexture = colorTexture;
2252+
properties.get( renderTarget.depthTexture ).__webglTexture = renderTargetProperties.__autoAllocateDepthBuffer ? undefined : depthTexture;
22582253

2259-
}
2254+
renderTargetProperties.__hasExternalTextures = true;
22602255

22612256
};
22622257

src/renderers/webxr/WebXRManager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -747,7 +747,7 @@ class WebXRManager extends EventDispatcher {
747747
renderer.setRenderTargetTextures(
748748
newRenderTarget,
749749
glSubImage.colorTexture,
750-
glProjLayer.ignoreDepthValues ? undefined : glSubImage.depthStencilTexture );
750+
glSubImage.depthStencilTexture );
751751

752752
renderer.setRenderTarget( newRenderTarget );
753753

0 commit comments

Comments
 (0)