Bug 1694909 - Part 11 - Remove texture array shader variations. r=gw

A small patch but probably the most impactful of this series as it removes a whole lot of generated shaders.

Differential Revision: https://phabricator.services.mozilla.com/D106509
This commit is contained in:
Nicolas Silva 2021-02-26 14:54:18 +00:00
Родитель ab19851395
Коммит 75a406eaaa
2 изменённых файлов: 1 добавлений и 9 удалений

Просмотреть файл

@ -22,11 +22,7 @@
#include base
#if defined(WR_FEATURE_TEXTURE_EXTERNAL) || defined(WR_FEATURE_TEXTURE_RECT) || defined(WR_FEATURE_TEXTURE_2D)
#define TEX_SAMPLE(sampler, tex_coord) texture(sampler, tex_coord.xy)
#else
#define TEX_SAMPLE(sampler, tex_coord) texture(sampler, tex_coord)
#endif
#if defined(WR_FEATURE_TEXTURE_EXTERNAL) && defined(PLATFORM_ANDROID)
// On some Mali GPUs we have encountered crashes in glDrawElements when using
@ -187,10 +183,6 @@ uniform sampler2DRect sColor2;
uniform samplerExternalOES sColor0;
uniform samplerExternalOES sColor1;
uniform samplerExternalOES sColor2;
#elif defined WR_FEATURE_TEXTURE_2D_ARRAY
uniform sampler2DArray sColor0;
uniform sampler2DArray sColor1;
uniform sampler2DArray sColor2;
#endif
#ifdef WR_FEATURE_DITHERING

Просмотреть файл

@ -109,7 +109,7 @@ pub fn get_shader_features(flags: ShaderFeatureFlags) -> ShaderFeatures {
}
// Image brush shaders
let mut texture_types = vec!["TEXTURE_2D_ARRAY", "TEXTURE_2D"];
let mut texture_types = vec!["TEXTURE_2D"];
if flags.contains(ShaderFeatureFlags::GL) {
texture_types.push("TEXTURE_RECT");
}