Skip to content

Commit f363fe6

Browse files
authored
Fix multiview for WebXRManager, some changes were lost in a previous rebase (#25)
1 parent c44ecf2 commit f363fe6

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

src/renderers/WebGLRenderer.js

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -524,7 +524,7 @@ class WebGLRenderer {
524524

525525
// xr
526526

527-
const xr = new WebXRManager( _this, _gl );
527+
const xr = new WebXRManager( _this, _gl, extensions, multiviewStereo );
528528

529529
/**
530530
* A reference to the XR manager.
@@ -1687,6 +1687,8 @@ class WebGLRenderer {
16871687

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

1690+
textures.runDeferredUploads();
1691+
16901692
// _gl.finish();
16911693

16921694
bindingStates.resetDefaultState();
@@ -2711,7 +2713,7 @@ class WebGLRenderer {
27112713
const renderTargetProperties = properties.get( renderTarget );
27122714

27132715
renderTargetProperties.__autoAllocateDepthBuffer = renderTarget.resolveDepthBuffer === false;
2714-
if ( ! renderTargetProperties.__autoAllocateDepthBuffer === false && ( ! _currentRenderTarget || ! _currentRenderTarget.isWebGLMultiviewRenderTarget ) ) {
2716+
if ( ! renderTargetProperties.__autoAllocateDepthBuffer ) {
27152717

27162718
// The multisample_render_to_texture extension doesn't work properly if there
27172719
// are midframe flushes and an external depth buffer. Disable use of the extension.

src/renderers/webgl/WebGLPrograms.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -567,7 +567,7 @@ function WebGLPrograms( renderer, cubemaps, cubeuvmaps, extensions, capabilities
567567
if ( parameters.alphaToCoverage )
568568
_programLayers.enable( 21 );
569569
if ( parameters.numMultiviewViews )
570-
_programLayers.enable( 21 );
570+
_programLayers.enable( 22 );
571571

572572
array.push( _programLayers.mask );
573573

src/renderers/webgl/WebGLTextures.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -853,6 +853,8 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
853853

854854
}
855855

856+
}
857+
856858
function setDeferTextureUploads( deferFlag ) {
857859

858860
_deferTextureUploads = deferFlag;

0 commit comments

Comments
 (0)