Skip to content
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

Jump to bottom

[core] Do not fail if half float extension not found and we are not forcing half float rendering. #2410

Merged
merged 11 commits into from Nov 19, 2019
Merged

[core] Do not fail if half float extension not found and we are not forcing half float rendering. #2410

Changes from 8 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
4ea5873
add flag
annxingyuan Nov 19, 2019
4210923
logic
annxingyuan Nov 19, 2019
4c73548
logic
annxingyuan Nov 19, 2019
c7da9ff
Merge branch 'master' into hf_opt
annxingyuan Nov 19, 2019
634a03f
edit
annxingyuan Nov 19, 2019
5e3169c
ooops
annxingyuan Nov 19, 2019
08fe115
Merge branch 'master' into hf_opt
annxingyuan Nov 19, 2019
74cf627
Merge branch 'master' into hf_opt
annxingyuan Nov 19, 2019
c126470
dont always get
annxingyuan Nov 19, 2019
0458033
Merge branch 'master' into hf_opt
annxingyuan Nov 19, 2019
057e923
save
annxingyuan Nov 19, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
27 changes: 18 additions & 9 deletions tfjs-core/src/backends/webgl/gpgpu_context.ts
View file
Open in desktop
Expand Up @@ -58,19 +58,28 @@ export class GPGPUContext {
this.gl = getWebGLContext(glVersion);
}
// WebGL 2.0 enables texture floats without an extension.
let COLOR_BUFFER_FLOAT = 'WEBGL_color_buffer_float';
const COLOR_BUFFER_HALF_FLOAT = 'EXT_color_buffer_half_float';
if (env().getNumber('WEBGL_VERSION') === 1) {
this.textureFloatExtension = webgl_util.getExtensionOrThrow(
this.gl, this.debug, 'OES_texture_float');
this.colorBufferFloatExtension =
this.gl.getExtension('WEBGL_color_buffer_float');
const TEXTURE_FLOAT = 'OES_texture_float';
const TEXTURE_HALF_FLOAT = 'OES_texture_half_float';

this.textureFloatExtension =
webgl_util.getExtensionOrThrow(this.gl, this.debug, TEXTURE_FLOAT);
if (webgl_util.hasExtension(this.gl, TEXTURE_HALF_FLOAT)) {
this.textureHalfFloatExtension = webgl_util.getExtensionOrThrow(
this.gl, this.debug, TEXTURE_HALF_FLOAT);
} else if (env().get('WEBGL_FORCE_F16_TEXTURES')) {
throw new Error(
'GL context does not support half float textures, yet the ' +
'environment flag WEBGL_FORCE_F16_TEXTURES is set to true.');
}

this.textureHalfFloatExtension = webgl_util.getExtensionOrThrow(
this.gl, this.debug, 'OES_texture_half_float');
this.colorBufferFloatExtension = this.gl.getExtension(COLOR_BUFFER_FLOAT);
this.colorBufferHalfFloatExtension =
this.gl.getExtension('EXT_color_buffer_half_float');
this.gl.getExtension(COLOR_BUFFER_HALF_FLOAT);
} else {
const COLOR_BUFFER_FLOAT = 'EXT_color_buffer_float';
const COLOR_BUFFER_HALF_FLOAT = 'EXT_color_buffer_half_float';
COLOR_BUFFER_FLOAT = 'EXT_color_buffer_float';
if (webgl_util.hasExtension(this.gl, COLOR_BUFFER_FLOAT)) {
this.colorBufferFloatExtension =
this.gl.getExtension(COLOR_BUFFER_FLOAT);
Expand Down