Skip to content

Fix multiview for WebXRManager, restoring and updating lost changes #25

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dmarcos merged 1 commit into from
Sep 17, 2025
Merged

Fix multiview for WebXRManager, restoring and updating lost changes #25

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions src/renderers/WebGLRenderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -524,7 +524,7 @@

// xr

const xr = new WebXRManager( _this, _gl );
const xr = new WebXRManager( _this, _gl, extensions, multiviewStereo );

/**
* A reference to the XR manager.
Expand Down Expand Up @@ -1687,6 +1687,8 @@

if ( scene.isScene === true ) scene.onAfterRender( _this, scene, camera );

textures.runDeferredUploads();

// _gl.finish();

bindingStates.resetDefaultState();
Expand Down Expand Up @@ -2657,7 +2659,7 @@

if ( ! warned ) {

console.warn( "THREE.WebGLRenderer.setTexture2D: don't use render targets as textures. Use their .texture property instead." );

Check failure on line 2662 in src/renderers/WebGLRenderer.js

View workflow job for this annotation

GitHub Actions / Lint testing 

Strings must use singlequote
warned = true;

}
Expand Down Expand Up @@ -2711,7 +2713,7 @@
const renderTargetProperties = properties.get( renderTarget );

renderTargetProperties.__autoAllocateDepthBuffer = renderTarget.resolveDepthBuffer === false;
if ( ! renderTargetProperties.__autoAllocateDepthBuffer === false && ( ! _currentRenderTarget || ! _currentRenderTarget.isWebGLMultiviewRenderTarget ) ) {
if ( ! renderTargetProperties.__autoAllocateDepthBuffer ) {

// The multisample_render_to_texture extension doesn't work properly if there
// are midframe flushes and an external depth buffer. Disable use of the extension.
Expand Down
2 changes: 1 addition & 1 deletion src/renderers/webgl/WebGLPrograms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -567,7 +567,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
if ( parameters.alphaToCoverage )
_programLayers.enable( 21 );
if ( parameters.numMultiviewViews )
_programLayers.enable( 21 );
_programLayers.enable( 22 );

array.push( _programLayers.mask );

Expand Down
2 changes: 2 additions & 0 deletions src/renderers/webgl/WebGLTextures.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -853,6 +853,8 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,

}

}

function setDeferTextureUploads( deferFlag ) {

_deferTextureUploads = deferFlag;
Expand Down
Loading