mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-01-17 12:55:53 +00:00
Code Issues 1 Projects Releases Wiki Activity

d3dshader: Fix gamma and primaries conversion pixel shader

Browse source 
Fixing regression introduced by the commit of f52ecb9607

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/6802>
This commit is contained in:
Seungha Yang 2024-05-04 19:52:59 +09:00
parent 73c64e8182
commit 9acf4fc139
1 changed files with 70 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

134
subprojects/gst-plugins-bad/gst-libs/gst/d3dshader/converter-hlsl/PSMain_converter.hlsl
View file

@ -558,24 +558,25 @@ class ConverterGamma : IConverter
{ {
float4 Execute (float4 sample) float4 Execute (float4 sample)
{ {
float3 rgb_space;
float3 out_space; float3 out_space;
out_space.x = dot (preCoeff.CoeffX, sample.xyz); rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);
out_space.y = dot (preCoeff.CoeffY, sample.xyz); rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);
out_space.z = dot (preCoeff.CoeffZ, sample.xyz); rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);
out_space += preCoeff.Offset; rgb_space += preCoeff.Offset;
out_space = clamp (out_space, preCoeff.Min, preCoeff.Max); rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);
out_space.x = gammaDecLUT.Sample (lutSamplerState, out_space.x); rgb_space.x = gammaDecLUT.Sample (lutSamplerState, rgb_space.x);
out_space.y = gammaDecLUT.Sample (lutSamplerState, out_space.y); rgb_space.y = gammaDecLUT.Sample (lutSamplerState, rgb_space.y);
out_space.z = gammaDecLUT.Sample (lutSamplerState, out_space.z); rgb_space.z = gammaDecLUT.Sample (lutSamplerState, rgb_space.z);
out_space.x = gammaEncLUT.Sample (lutSamplerState, out_space.x); rgb_space.x = gammaEncLUT.Sample (lutSamplerState, rgb_space.x);
out_space.y = gammaEncLUT.Sample (lutSamplerState, out_space.y); rgb_space.y = gammaEncLUT.Sample (lutSamplerState, rgb_space.y);
out_space.z = gammaEncLUT.Sample (lutSamplerState, out_space.z); rgb_space.z = gammaEncLUT.Sample (lutSamplerState, rgb_space.z);
out_space.x = dot (postCoeff.CoeffX, out_space); out_space.x = dot (postCoeff.CoeffX, rgb_space);
out_space.y = dot (postCoeff.CoeffY, out_space); out_space.y = dot (postCoeff.CoeffY, rgb_space);
out_space.z = dot (postCoeff.CoeffZ, out_space); out_space.z = dot (postCoeff.CoeffZ, rgb_space);
out_space += postCoeff.Offset; out_space += postCoeff.Offset;
return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a); return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
} }
@ -585,29 +586,31 @@ class ConverterPrimary : IConverter
{ {
float4 Execute (float4 sample) float4 Execute (float4 sample)
{ {
float3 rgb_space;
float3 primary_converted;
float3 out_space; float3 out_space;
float3 tmp;
out_space.x = dot (preCoeff.CoeffX, sample.xyz);
out_space.y = dot (preCoeff.CoeffY, sample.xyz);
out_space.z = dot (preCoeff.CoeffZ, sample.xyz);
out_space += preCoeff.Offset;
out_space = clamp (out_space, preCoeff.Min, preCoeff.Max);
out_space.x = gammaDecLUT.Sample (lutSamplerState, out_space.x); rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);
out_space.y = gammaDecLUT.Sample (lutSamplerState, out_space.y); rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);
out_space.z = gammaDecLUT.Sample (lutSamplerState, out_space.z); rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);
rgb_space += preCoeff.Offset;
rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);
tmp.x = dot (primariesCoeff.CoeffX, out_space); rgb_space.x = gammaDecLUT.Sample (lutSamplerState, rgb_space.x);
tmp.y = dot (primariesCoeff.CoeffY, out_space); rgb_space.y = gammaDecLUT.Sample (lutSamplerState, rgb_space.y);
tmp.z = dot (primariesCoeff.CoeffZ, out_space); rgb_space.z = gammaDecLUT.Sample (lutSamplerState, rgb_space.z);
out_space.x = gammaEncLUT.Sample (lutSamplerState, tmp.x); primary_converted.x = dot (primariesCoeff.CoeffX, rgb_space);
out_space.y = gammaEncLUT.Sample (lutSamplerState, tmp.y); primary_converted.y = dot (primariesCoeff.CoeffY, rgb_space);
out_space.z = gammaEncLUT.Sample (lutSamplerState, tmp.z); primary_converted.z = dot (primariesCoeff.CoeffZ, rgb_space);
out_space.x = dot (postCoeff.CoeffX, out_space); rgb_space.x = gammaEncLUT.Sample (lutSamplerState, primary_converted.x);
out_space.y = dot (postCoeff.CoeffY, out_space); rgb_space.y = gammaEncLUT.Sample (lutSamplerState, primary_converted.y);
out_space.z = dot (postCoeff.CoeffZ, out_space); rgb_space.z = gammaEncLUT.Sample (lutSamplerState, primary_converted.z);
out_space.x = dot (postCoeff.CoeffX, rgb_space);
out_space.y = dot (postCoeff.CoeffY, rgb_space);
out_space.z = dot (postCoeff.CoeffZ, rgb_space);
out_space += postCoeff.Offset; out_space += postCoeff.Offset;
return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a); return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);
} }
@ -1677,24 +1680,25 @@ static const char str_PSMain_converter[] =
"{\n" "{\n"
" float4 Execute (float4 sample)\n" " float4 Execute (float4 sample)\n"
" {\n" " {\n"
" float3 rgb_space;\n"
" float3 out_space;\n" " float3 out_space;\n"
" out_space.x = dot (preCoeff.CoeffX, sample.xyz);\n" " rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);\n"
" out_space.y = dot (preCoeff.CoeffY, sample.xyz);\n" " rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);\n"
" out_space.z = dot (preCoeff.CoeffZ, sample.xyz);\n" " rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);\n"
" out_space += preCoeff.Offset;\n" " rgb_space += preCoeff.Offset;\n"
" out_space = clamp (out_space, preCoeff.Min, preCoeff.Max);\n" " rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);\n"
"\n" "\n"
" out_space.x = gammaDecLUT.Sample (lutSamplerState, out_space.x);\n" " rgb_space.x = gammaDecLUT.Sample (lutSamplerState, rgb_space.x);\n"
" out_space.y = gammaDecLUT.Sample (lutSamplerState, out_space.y);\n" " rgb_space.y = gammaDecLUT.Sample (lutSamplerState, rgb_space.y);\n"
" out_space.z = gammaDecLUT.Sample (lutSamplerState, out_space.z);\n" " rgb_space.z = gammaDecLUT.Sample (lutSamplerState, rgb_space.z);\n"
"\n" "\n"
" out_space.x = gammaEncLUT.Sample (lutSamplerState, out_space.x);\n" " rgb_space.x = gammaEncLUT.Sample (lutSamplerState, rgb_space.x);\n"
" out_space.y = gammaEncLUT.Sample (lutSamplerState, out_space.y);\n" " rgb_space.y = gammaEncLUT.Sample (lutSamplerState, rgb_space.y);\n"
" out_space.z = gammaEncLUT.Sample (lutSamplerState, out_space.z);\n" " rgb_space.z = gammaEncLUT.Sample (lutSamplerState, rgb_space.z);\n"
"\n" "\n"
" out_space.x = dot (postCoeff.CoeffX, out_space);\n" " out_space.x = dot (postCoeff.CoeffX, rgb_space);\n"
" out_space.y = dot (postCoeff.CoeffY, out_space);\n" " out_space.y = dot (postCoeff.CoeffY, rgb_space);\n"
" out_space.z = dot (postCoeff.CoeffZ, out_space);\n" " out_space.z = dot (postCoeff.CoeffZ, rgb_space);\n"
" out_space += postCoeff.Offset;\n" " out_space += postCoeff.Offset;\n"
" return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);\n" " return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);\n"
" }\n" " }\n"
@ -1704,29 +1708,31 @@ static const char str_PSMain_converter[] =
"{\n" "{\n"
" float4 Execute (float4 sample)\n" " float4 Execute (float4 sample)\n"
" {\n" " {\n"
" float3 rgb_space;\n"
" float3 primary_converted;\n"
" float3 out_space;\n" " float3 out_space;\n"
" float3 tmp;\n"
" out_space.x = dot (preCoeff.CoeffX, sample.xyz);\n"
" out_space.y = dot (preCoeff.CoeffY, sample.xyz);\n"
" out_space.z = dot (preCoeff.CoeffZ, sample.xyz);\n"
" out_space += preCoeff.Offset;\n"
" out_space = clamp (out_space, preCoeff.Min, preCoeff.Max);\n"
"\n" "\n"
" out_space.x = gammaDecLUT.Sample (lutSamplerState, out_space.x);\n" " rgb_space.x = dot (preCoeff.CoeffX, sample.xyz);\n"
" out_space.y = gammaDecLUT.Sample (lutSamplerState, out_space.y);\n" " rgb_space.y = dot (preCoeff.CoeffY, sample.xyz);\n"
" out_space.z = gammaDecLUT.Sample (lutSamplerState, out_space.z);\n" " rgb_space.z = dot (preCoeff.CoeffZ, sample.xyz);\n"
" rgb_space += preCoeff.Offset;\n"
" rgb_space = clamp (rgb_space, preCoeff.Min, preCoeff.Max);\n"
"\n" "\n"
" tmp.x = dot (primariesCoeff.CoeffX, out_space);\n" " rgb_space.x = gammaDecLUT.Sample (lutSamplerState, rgb_space.x);\n"
" tmp.y = dot (primariesCoeff.CoeffY, out_space);\n" " rgb_space.y = gammaDecLUT.Sample (lutSamplerState, rgb_space.y);\n"
" tmp.z = dot (primariesCoeff.CoeffZ, out_space);\n" " rgb_space.z = gammaDecLUT.Sample (lutSamplerState, rgb_space.z);\n"
"\n" "\n"
" out_space.x = gammaEncLUT.Sample (lutSamplerState, tmp.x);\n" " primary_converted.x = dot (primariesCoeff.CoeffX, rgb_space);\n"
" out_space.y = gammaEncLUT.Sample (lutSamplerState, tmp.y);\n" " primary_converted.y = dot (primariesCoeff.CoeffY, rgb_space);\n"
" out_space.z = gammaEncLUT.Sample (lutSamplerState, tmp.z);\n" " primary_converted.z = dot (primariesCoeff.CoeffZ, rgb_space);\n"
"\n" "\n"
" out_space.x = dot (postCoeff.CoeffX, out_space);\n" " rgb_space.x = gammaEncLUT.Sample (lutSamplerState, primary_converted.x);\n"
" out_space.y = dot (postCoeff.CoeffY, out_space);\n" " rgb_space.y = gammaEncLUT.Sample (lutSamplerState, primary_converted.y);\n"
" out_space.z = dot (postCoeff.CoeffZ, out_space);\n" " rgb_space.z = gammaEncLUT.Sample (lutSamplerState, primary_converted.z);\n"
"\n"
" out_space.x = dot (postCoeff.CoeffX, rgb_space);\n"
" out_space.y = dot (postCoeff.CoeffY, rgb_space);\n"
" out_space.z = dot (postCoeff.CoeffZ, rgb_space);\n"
" out_space += postCoeff.Offset;\n" " out_space += postCoeff.Offset;\n"
" return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);\n" " return float4 (clamp (out_space, postCoeff.Min, postCoeff.Max), sample.a);\n"
" }\n" " }\n"