mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gl-renderer: move view alpha out of sample_input_texture()

Browse Source 
Sampling input texture has nothing to do with view alpha. This clarifies
the code structure.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
This commit is contained in:
Pekka Paalanen
2021-02-09 13:27:36 +02:00
parent 3f6be39f94
commit 2b5a863974
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/renderer-gl/fragment.glsl
+7 -8
View File
@@ -87,20 +87,20 @@ uniform vec4 unicolor;
vec4 vec4
sample_input_texture() sample_input_texture()
{ {
vec4 yuva; vec4 yuva = vec4(0.0, 0.0, 0.0, 1.0);
/* Producing RGBA directly */ /* Producing RGBA directly */
if (c_variant == SHADER_VARIANT_SOLID) if (c_variant == SHADER_VARIANT_SOLID)
return alpha * unicolor; return unicolor;
if (c_variant == SHADER_VARIANT_RGBA || if (c_variant == SHADER_VARIANT_RGBA ||
c_variant == SHADER_VARIANT_EXTERNAL) { c_variant == SHADER_VARIANT_EXTERNAL) {
return alpha * texture2D(tex, v_texcoord); return texture2D(tex, v_texcoord);
} }
if (c_variant == SHADER_VARIANT_RGBX) if (c_variant == SHADER_VARIANT_RGBX)
return vec4(alpha * texture2D(tex, v_texcoord).rgb, alpha); return vec4(texture2D(tex, v_texcoord).rgb, 1.0);
/* Requires conversion to RGBA */ /* Requires conversion to RGBA */
@@ -108,21 +108,17 @@ sample_input_texture()
yuva.x = texture2D(tex, v_texcoord).x; yuva.x = texture2D(tex, v_texcoord).x;
yuva.y = texture2D(tex1, v_texcoord).x; yuva.y = texture2D(tex1, v_texcoord).x;
yuva.z = texture2D(tex2, v_texcoord).x; yuva.z = texture2D(tex2, v_texcoord).x;
yuva.w = alpha;
} else if (c_variant == SHADER_VARIANT_Y_UV) { } else if (c_variant == SHADER_VARIANT_Y_UV) {
yuva.x = texture2D(tex, v_texcoord).x; yuva.x = texture2D(tex, v_texcoord).x;
yuva.yz = texture2D(tex1, v_texcoord).rg; yuva.yz = texture2D(tex1, v_texcoord).rg;
yuva.w = alpha;
} else if (c_variant == SHADER_VARIANT_Y_XUXV) { } else if (c_variant == SHADER_VARIANT_Y_XUXV) {
yuva.x = texture2D(tex, v_texcoord).x; yuva.x = texture2D(tex, v_texcoord).x;
yuva.yz = texture2D(tex1, v_texcoord).ga; yuva.yz = texture2D(tex1, v_texcoord).ga;
yuva.w = alpha;
} else if (c_variant == SHADER_VARIANT_XYUV) { } else if (c_variant == SHADER_VARIANT_XYUV) {
yuva.xyz = texture2D(tex, v_texcoord).bgr; yuva.xyz = texture2D(tex, v_texcoord).bgr;
yuva.w = alpha;
} else { } else {
/* Never reached, bad variant value. */ /* Never reached, bad variant value. */
@@ -140,6 +136,9 @@ main()
/* Electrical (non-linear) RGBA values, pre-multiplied */ /* Electrical (non-linear) RGBA values, pre-multiplied */
color = sample_input_texture(); color = sample_input_texture();
/* View alpha (opacity) */
color *= alpha;
if (c_green_tint) if (c_green_tint)
color = vec4(0.0, 0.3, 0.0, 0.2) + color * 0.8; color = vec4(0.0, 0.3, 0.0, 0.2) + color * 0.8;