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.

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

Fix GL panic with updated ANGLE #24583

Merged
merged 1 commit into from Oct 30, 2019
Merged
Changes from all commits
Commits
File filter...
Filter file types
Jump to…
Jump to file
Failed to load files.

Always

Just for now

webgl: Always convert float/half-float-based types to internal textur…

…e types.
  • Loading branch information
jdm committed Oct 29, 2019
commit c312646c2405acb9516e5e6f24b28e02bd2f67ca
@@ -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 {
@@ -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 {
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.