Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1870413 - Allow creating TEXTURE_EXTERNAL_BT709 shaders on devices without image_external_essl3. r=gfx-reviewers,lsalzman

Browse Source 
An oversight when updating the allowed shaders list in bug 1866020
assumed that devices without GL_OES_EGL_image_external_essl3 would
also not have GL_EXT_YUV_target. This turns out not to always be the
case, and results in a crash when attempting to initialize the shaders
on such devices.

This patch checks explicitly for GL_EXT_YUV_target when generating the
allowed shaders list.

Differential Revision: https://phabricator.services.mozilla.com/D196716
This commit is contained in:
Jamie Nicol 2023-12-18 18:04:56 +00:00
parent a6655420a0
commit 99efeaadab
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
gfx/wr/webrender/src/renderer/shade.rs
View File

@ -661,7 +661,7 @@ impl Shaders {
} else {
TextureExternalVersion::ESSL1
};
let mut shader_flags = get_shader_feature_flags(gl_type, texture_external_version);
let mut shader_flags = get_shader_feature_flags(gl_type, texture_external_version, device);
shader_flags.set(ShaderFeatureFlags::ADVANCED_BLEND_EQUATION, use_advanced_blend_equation);
shader_flags.set(ShaderFeatureFlags::DUAL_SOURCE_BLENDING, use_dual_source_blending);
shader_flags.set(ShaderFeatureFlags::DITHERING, options.enable_dithering);
@ -1355,7 +1355,7 @@ impl CompositorShaders {
TextureExternalVersion::ESSL1
};
let feature_flags = get_shader_feature_flags(gl_type, texture_external_version);
let feature_flags = get_shader_feature_flags(gl_type, texture_external_version, device);
let shader_list = get_shader_features(feature_flags);
for _ in 0..IMAGE_BUFFER_KINDS.len() {
@ -1485,18 +1485,23 @@ impl CompositorShaders {
}
}
fn get_shader_feature_flags(gl_type: GlType, texture_external_version: TextureExternalVersion) -> ShaderFeatureFlags {
fn get_shader_feature_flags(
gl_type: GlType,
texture_external_version: TextureExternalVersion,
device: &Device
) -> ShaderFeatureFlags {
match gl_type {
GlType::Gl => ShaderFeatureFlags::GL,
GlType::Gles => {
let texture_external_flag = match texture_external_version {
TextureExternalVersion::ESSL3 => {
ShaderFeatureFlags::TEXTURE_EXTERNAL
| ShaderFeatureFlags::TEXTURE_EXTERNAL_BT709
}
let mut flags = ShaderFeatureFlags::GLES;
flags |= match texture_external_version {
TextureExternalVersion::ESSL3 => ShaderFeatureFlags::TEXTURE_EXTERNAL,
TextureExternalVersion::ESSL1 => ShaderFeatureFlags::TEXTURE_EXTERNAL_ESSL1,
};
ShaderFeatureFlags::GLES | texture_external_flag
if device.supports_extension("GL_EXT_YUV_target") {
flags |= ShaderFeatureFlags::TEXTURE_EXTERNAL_BT709;
}
flags
}
}
}