Skip to content

Commit d8dc3dd

Browse files
authored
WebGLRenderer: Clean up setupRenderBufferStorage (#32456)
1 parent 7c74b3d commit d8dc3dd

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

src/renderers/webgl/WebGLTextures.js

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1575,7 +1575,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
15751575
}
15761576

15771577
// Setup storage for internal depth/stencil buffers and bind to correct framebuffer
1578-
function setupRenderBufferStorage( renderbuffer, renderTarget, isMultisample ) {
1578+
function setupRenderBufferStorage( renderbuffer, renderTarget, useMultisample ) {
15791579

15801580
_gl.bindRenderbuffer( _gl.RENDERBUFFER, renderbuffer );
15811581

@@ -1588,15 +1588,13 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
15881588
const glAttachmentType = renderTarget.stencilBuffer ? _gl.DEPTH_STENCIL_ATTACHMENT : _gl.DEPTH_ATTACHMENT;
15891589

15901590
// set up the attachment
1591-
const samples = getRenderTargetSamples( renderTarget );
1592-
const isUseMultisampledRTT = useMultisampledRTT( renderTarget );
1593-
if ( isUseMultisampledRTT ) {
1591+
if ( useMultisampledRTT( renderTarget ) ) {
15941592

1595-
multisampledRTTExt.renderbufferStorageMultisampleEXT( _gl.RENDERBUFFER, samples, glInternalFormat, renderTarget.width, renderTarget.height );
1593+
multisampledRTTExt.renderbufferStorageMultisampleEXT( _gl.RENDERBUFFER, getRenderTargetSamples( renderTarget ), glInternalFormat, renderTarget.width, renderTarget.height );
15961594

1597-
} else if ( isMultisample ) {
1595+
} else if ( useMultisample ) {
15981596

1599-
_gl.renderbufferStorageMultisample( _gl.RENDERBUFFER, samples, glInternalFormat, renderTarget.width, renderTarget.height );
1597+
_gl.renderbufferStorageMultisample( _gl.RENDERBUFFER, getRenderTargetSamples( renderTarget ), glInternalFormat, renderTarget.width, renderTarget.height );
16001598

16011599
} else {
16021600

@@ -1617,15 +1615,14 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils,
16171615
const glFormat = utils.convert( texture.format, texture.colorSpace );
16181616
const glType = utils.convert( texture.type );
16191617
const glInternalFormat = getInternalFormat( texture.internalFormat, glFormat, glType, texture.colorSpace );
1620-
const samples = getRenderTargetSamples( renderTarget );
16211618

1622-
if ( isMultisample && useMultisampledRTT( renderTarget ) === false ) {
1619+
if ( useMultisampledRTT( renderTarget ) ) {
16231620

1624-
_gl.renderbufferStorageMultisample( _gl.RENDERBUFFER, samples, glInternalFormat, renderTarget.width, renderTarget.height );
1621+
multisampledRTTExt.renderbufferStorageMultisampleEXT( _gl.RENDERBUFFER, getRenderTargetSamples( renderTarget ), glInternalFormat, renderTarget.width, renderTarget.height );
16251622

1626-
} else if ( useMultisampledRTT( renderTarget ) ) {
1623+
} else if ( useMultisample ) {
16271624

1628-
multisampledRTTExt.renderbufferStorageMultisampleEXT( _gl.RENDERBUFFER, samples, glInternalFormat, renderTarget.width, renderTarget.height );
1625+
_gl.renderbufferStorageMultisample( _gl.RENDERBUFFER, getRenderTargetSamples( renderTarget ), glInternalFormat, renderTarget.width, renderTarget.height );
16291626

16301627
} else {
16311628

0 commit comments

Comments
 (0)