frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

glamor: xv: Rewrite UYVY shader to match NV12/I420 CSC 

This rewrites the shader so that we use the same (more flexible) CSC as
we have for I420 and NV12. This also fixes the reverse of odd/even which
caused chroma shift.

Signed-off-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Part-of: <https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/1633>
This commit is contained in:
Nicolas Dufresne 2024-07-30 15:53:25 -04:00 committed by Konstantin
parent eb26f32368
commit 39c8a6f367
1 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
glamor/glamor_xv.c
View File

@ -141,23 +141,21 @@ static const glamor_facet glamor_facet_xv_uyvy = {
"in vec2 tcs;\n" "in vec2 tcs;\n"
), ),
.fs_exec = ( .fs_exec = (
" vec3 uyv;\n" " vec4 temp1;\n"
" vec4 frameOut = texture2D(sampler, tcs.st);\n" " vec2 xy = texture(sampler, tcs.st).xy;\n"
" vec2 prev_xy = texture(sampler, vec2(tcs.s - texelSize.x, tcs.t)).xy;\n"
" vec2 next_xy = texture(sampler, vec2(tcs.s + texelSize.x, tcs.t)).xy;\n"
"\n" "\n"
" vec4 prevPixel = texture2D(sampler, vec2(tcs.s - texelSize.x, tcs.t));\n" " vec3 sample_yuv;\n"
" vec4 nextPixel = texture2D(sampler, vec2(tcs.s + texelSize.x, tcs.t));\n" " int odd = int(mod(tcs.x / texelSize.x, 2.0));\n"
" int even = 1 - odd;\n"
" sample_yuv.yxz = float(even)*vec3(xy, next_xy.x) + float(odd)*vec3(prev_xy.x, xy.yx);\n"
"\n" "\n"
" float delta = 0.50;\n" " temp1.xyz = offsetyco.www * vec3(sample_yuv.x) + offsetyco.xyz;\n"
"\n" " temp1.xyz = ucogamma.xyz * vec3(sample_yuv.y) + temp1.xyz;\n"
" int even = int(mod(tcs.x / texelSize.x, 2.0));\n" " temp1.xyz = clamp(vco.xyz * vec3(sample_yuv.z) + temp1.xyz, 0.0, 1.0);\n"
"\n" " temp1.w = 1.0;\n"
" uyv.rgb = float(even)*vec3(frameOut.rg, nextPixel.r) + (1.0-float(even))*vec3(prevPixel.r, frameOut.gr);\n" " frag_color = temp1;\n"
"\n"
" frameOut.r = uyv.g + 1.403*(uyv.r - delta);\n"
" frameOut.g = uyv.g - 0.714*(uyv.r - delta) - 0.344*(uyv.b - delta);\n"
" frameOut.b = uyv.g + 1.773*(uyv.b - delta);\n"
" frameOut.a = 1.0;\n"
" frag_color = frameOut;\n"
), ),
}; };