videolan
/
vlc
mirror of https://code.videolan.org/videolan/vlc
1
Fork 0
Code Releases Activity

opengl: simplify swizzle 

The commit ca7d2ea4b6 introduced an xyzw
swizzle, whereas the previous code was using an rgba swizzle. No other
location used the xyzw swizzle for texture so unify and use rgba
everywhere.

Different version from aa5bec3b49
This commit is contained in:
Romain Vimont 2022-03-30 11:31:08 +02:00 committed by Hugo Beauzée-Luyssen
parent 802f36cf10
commit 25d66728eb
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
modules/video_output/opengl/sampler.c
View File

@ -435,16 +435,11 @@ opengl_init_swizzle(struct vlc_gl_sampler *sampler,
swizzle_per_tex[0] = swizzle_per_tex[1] = swizzle_per_tex[2] = "r";
else if (desc->plane_count == 2)
{
swizzle_per_tex[0] = "r";
if (oneplane_texfmt == GL_RED)
{
swizzle_per_tex[0] = "r";
swizzle_per_tex[1] = "rg";
}
else
{
swizzle_per_tex[0] = "x";
swizzle_per_tex[1] = "xw";
}
swizzle_per_tex[1] = "ra";
}
else if (desc->plane_count == 1)
{