Skip to content

Commit

Permalink
Merge pull request #21069 from higharc/get-float-extensions-fix
Browse files Browse the repository at this point in the history
Fix getting float render target extensions
  • Loading branch information
mrdoob authored Jan 12, 2021
2 parents 4457273 + f9a1b7f commit 1dd95a4
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/renderers/WebGLRenderer.js
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,11 @@ function WebGLRenderer( parameters ) {

capabilities = new WebGLCapabilities( _gl, extensions, parameters );

if ( capabilities.isWebGL2 === false ) {
if ( capabilities.isWebGL2 ) {

extensions.get( 'EXT_color_buffer_float' );

} else {

extensions.get( 'WEBGL_depth_texture' );
extensions.get( 'OES_texture_float' );
Expand All @@ -290,6 +294,7 @@ function WebGLRenderer( parameters ) {
}

extensions.get( 'OES_texture_float_linear' );
extensions.get( 'EXT_color_buffer_half_float' );

utils = new WebGLUtils( _gl, extensions, capabilities );

Expand Down Expand Up @@ -1889,9 +1894,11 @@ function WebGLRenderer( parameters ) {

}

const halfFloatSupportedByExt = textureType === HalfFloatType && ( extensions.get( 'EXT_color_buffer_half_float' ) || ( capabilities.isWebGL2 && extensions.get( 'EXT_color_buffer_float' ) ) );

if ( textureType !== UnsignedByteType && utils.convert( textureType ) !== _gl.getParameter( _gl.IMPLEMENTATION_COLOR_READ_TYPE ) && // IE11, Edge and Chrome Mac < 52 (#9513)
! ( textureType === FloatType && ( capabilities.isWebGL2 || extensions.get( 'OES_texture_float' ) || extensions.get( 'WEBGL_color_buffer_float' ) ) ) && // Chrome Mac >= 52 and Firefox
! ( textureType === HalfFloatType && ( capabilities.isWebGL2 ? extensions.get( 'EXT_color_buffer_float' ) : extensions.get( 'EXT_color_buffer_half_float' ) ) ) ) {
! halfFloatSupportedByExt ) {

console.error( 'THREE.WebGLRenderer.readRenderTargetPixels: renderTarget is not in UnsignedByteType or implementation defined type.' );
return;
Expand Down

0 comments on commit 1dd95a4

Please sign in to comment.