From a8cc32b19b8b2b633fe19eeb06af06bd56892695 Mon Sep 17 00:00:00 2001 From: "Mr.doob" Date: Fri, 20 Dec 2019 10:44:07 -0800 Subject: [PATCH] WebGLTextures: Clean up. --- src/renderers/webgl/WebGLTextures.js | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/src/renderers/webgl/WebGLTextures.js b/src/renderers/webgl/WebGLTextures.js index 88ed1c258dd80..94456168c8a18 100644 --- a/src/renderers/webgl/WebGLTextures.js +++ b/src/renderers/webgl/WebGLTextures.js @@ -137,12 +137,10 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, } - function getInternalFormat( texture, glFormat, glType ) { + function getInternalFormat( internalFormatName, glFormat, glType ) { if ( isWebGL2 === false ) return glFormat; - var internalFormatName = texture.internalFormat; // User specified internal format. - if ( internalFormatName !== null ) { if ( _gl[ internalFormatName ] !== undefined ) return _gl[ internalFormatName ]; @@ -437,7 +435,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, supportsMips = isPowerOfTwo( image ) || isWebGL2, glFormat = utils.convert( texture.format ), glType = utils.convert( texture.type ), - glInternalFormat = getInternalFormat( texture, glFormat, glType ); + glInternalFormat = getInternalFormat( texture.internalFormat, glFormat, glType ); setTextureParameters( _gl.TEXTURE_CUBE_MAP, texture, supportsMips ); @@ -659,7 +657,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, var supportsMips = isPowerOfTwo( image ) || isWebGL2, glFormat = utils.convert( texture.format ), glType = utils.convert( texture.type ), - glInternalFormat = getInternalFormat( texture, glFormat, glType ); + glInternalFormat = getInternalFormat( texture.internalFormat, glFormat, glType ); setTextureParameters( textureType, texture, supportsMips ); @@ -832,7 +830,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, var glFormat = utils.convert( renderTarget.texture.format ); var glType = utils.convert( renderTarget.texture.type ); - var glInternalFormat = getInternalFormat( renderTarget.texture, glFormat, glType ); + var glInternalFormat = getInternalFormat( renderTarget.texture.internalFormat, glFormat, glType ); state.texImage2D( textureTarget, 0, glInternalFormat, renderTarget.width, renderTarget.height, 0, glFormat, glType, null ); _gl.bindFramebuffer( _gl.FRAMEBUFFER, framebuffer ); _gl.framebufferTexture2D( _gl.FRAMEBUFFER, attachment, textureTarget, properties.get( renderTarget.texture ).__webglTexture, 0 ); @@ -882,7 +880,7 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, var glFormat = utils.convert( renderTarget.texture.format ); var glType = utils.convert( renderTarget.texture.type ); - var glInternalFormat = getInternalFormat( renderTarget.texture, glFormat, glType ); + var glInternalFormat = getInternalFormat( renderTarget.texture.internalFormat, glFormat, glType ); if ( isMultisample ) { @@ -1029,9 +1027,10 @@ function WebGLTextures( _gl, extensions, state, properties, capabilities, utils, renderTargetProperties.__webglColorRenderbuffer = _gl.createRenderbuffer(); _gl.bindRenderbuffer( _gl.RENDERBUFFER, renderTargetProperties.__webglColorRenderbuffer ); + var glFormat = utils.convert( renderTarget.texture.format ); var glType = utils.convert( renderTarget.texture.type ); - var glInternalFormat = getInternalFormat( renderTarget.texture, glFormat, glType ); + var glInternalFormat = getInternalFormat( renderTarget.texture.internalFormat, glFormat, glType ); var samples = getRenderTargetSamples( renderTarget ); _gl.renderbufferStorageMultisample( _gl.RENDERBUFFER, samples, glInternalFormat, renderTarget.width, renderTarget.height );