diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-10-29 17:17:57 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-10-29 18:29:07 -0400 |
| commit | c312646c2405acb9516e5e6f24b28e02bd2f67ca (patch) | |
| tree | d9746ea4ee9c190bfe4137a89e8d1d1eab2e1a6d /components/script/dom/webgl_extensions/ext | |
| parent | 571dc127a2f51d3fb7093c06f22682ada123c4e1 (diff) | |
| download | servo-c312646c2405acb9516e5e6f24b28e02bd2f67ca.tar.gz servo-c312646c2405acb9516e5e6f24b28e02bd2f67ca.zip | |
webgl: Always convert float/half-float-based types to internal texture types.
Diffstat (limited to 'components/script/dom/webgl_extensions/ext')
| -rw-r--r-- | components/script/dom/webgl_extensions/ext/oestexturefloat.rs | 24 | ||||
| -rw-r--r-- | components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs | 20 |
2 files changed, 18 insertions, 26 deletions
diff --git a/components/script/dom/webgl_extensions/ext/oestexturefloat.rs b/components/script/dom/webgl_extensions/ext/oestexturefloat.rs index a0ddf13d987..b3461f9876c 100644 --- a/components/script/dom/webgl_extensions/ext/oestexturefloat.rs +++ b/components/script/dom/webgl_extensions/ext/oestexturefloat.rs @@ -49,21 +49,15 @@ impl WebGLExtension for OESTextureFloat { fn enable(ext: &WebGLExtensions) { ext.enable_tex_type(webgl::FLOAT); - if !ext.supports_gl_extension("GL_OES_texture_float") { - ext.add_effective_tex_internal_format(webgl::RGBA, webgl::FLOAT, gl::RGBA32F); - ext.add_effective_tex_internal_format(webgl::RGB, webgl::FLOAT, gl::RGB32F); - ext.add_effective_tex_internal_format( - webgl::LUMINANCE, - webgl::FLOAT, - gl::LUMINANCE32F_ARB, - ); - ext.add_effective_tex_internal_format(webgl::ALPHA, webgl::FLOAT, gl::ALPHA32F_ARB); - ext.add_effective_tex_internal_format( - webgl::LUMINANCE_ALPHA, - webgl::FLOAT, - gl::LUMINANCE_ALPHA32F_ARB, - ); - } + ext.add_effective_tex_internal_format(webgl::RGBA, webgl::FLOAT, gl::RGBA32F); + ext.add_effective_tex_internal_format(webgl::RGB, webgl::FLOAT, gl::RGB32F); + ext.add_effective_tex_internal_format(webgl::LUMINANCE, webgl::FLOAT, gl::LUMINANCE32F_ARB); + ext.add_effective_tex_internal_format(webgl::ALPHA, webgl::FLOAT, gl::ALPHA32F_ARB); + ext.add_effective_tex_internal_format( + webgl::LUMINANCE_ALPHA, + webgl::FLOAT, + gl::LUMINANCE_ALPHA32F_ARB, + ); } fn name() -> &'static str { diff --git a/components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs b/components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs index 4db4e1a54b2..bff4f76294d 100644 --- a/components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs +++ b/components/script/dom/webgl_extensions/ext/oestexturehalffloat.rs @@ -53,17 +53,15 @@ impl WebGLExtension for OESTextureHalfFloat { fn enable(ext: &WebGLExtensions) { let hf = OESTextureHalfFloatConstants::HALF_FLOAT_OES; ext.enable_tex_type(hf); - if !ext.supports_gl_extension("GL_OES_texture_half_float") { - ext.add_effective_tex_internal_format(webgl::RGBA, hf, gl::RGBA16F); - ext.add_effective_tex_internal_format(webgl::RGB, hf, gl::RGB16F); - ext.add_effective_tex_internal_format(webgl::LUMINANCE, hf, gl::LUMINANCE16F_ARB); - ext.add_effective_tex_internal_format(webgl::ALPHA, hf, gl::ALPHA16F_ARB); - ext.add_effective_tex_internal_format( - webgl::LUMINANCE_ALPHA, - hf, - gl::LUMINANCE_ALPHA16F_ARB, - ); - } + ext.add_effective_tex_internal_format(webgl::RGBA, hf, gl::RGBA16F); + ext.add_effective_tex_internal_format(webgl::RGB, hf, gl::RGB16F); + ext.add_effective_tex_internal_format(webgl::LUMINANCE, hf, gl::LUMINANCE16F_ARB); + ext.add_effective_tex_internal_format(webgl::ALPHA, hf, gl::ALPHA16F_ARB); + ext.add_effective_tex_internal_format( + webgl::LUMINANCE_ALPHA, + hf, + gl::LUMINANCE_ALPHA16F_ARB, + ); } fn name() -> &'static str { |