Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

Fixed chroma subsampling in color_heavy.fx and color.fx, nw

Browse Source
This commit is contained in:
Ryan Holtz 2011-05-18 02:17:31 +00:00
parent 8805896738
commit df5254338f
2 changed files with 28 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
hlsl/color.fx
View File

@ -129,26 +129,25 @@ uniform float QSubsampleLength = 3.0f;
float4 ps_main(PS_INPUT Input) : COLOR float4 ps_main(PS_INPUT Input) : COLOR
{ {
// -- Bandwidth Subsampling -- // -- Bandwidth Subsampling --
float YSubsampleWidth = (RawWidth * 2.0f) / YSubsampleLength; float3 SubsampleWidth = float3(YSubsampleLength, ISubsampleLength, QSubsampleLength);
float ISubsampleWidth = (RawWidth * 2.0f) / ISubsampleLength; SubsampleWidth = (RawWidth * 2.0f) / SubsampleWidth;
float QSubsampleWidth = (RawWidth * 2.0f) / QSubsampleLength; float3 SubsampleCoord = Input.TexCoord.x;
float3 SubsampleWidth = float3(YSubsampleWidth, ISubsampleWidth, QSubsampleWidth); float3 SubsampleFrac = frac(SubsampleCoord * SubsampleWidth); // Fraction is in subsample width units!
float3 SubsampleFrac = frac(Input.TexCoord.x * SubsampleWidth); SubsampleCoord = (SubsampleCoord * SubsampleWidth - SubsampleFrac) / SubsampleWidth;
float3 SubsampleCoord = (Input.TexCoord.x * SubsampleWidth - SubsampleFrac) / SubsampleWidth + SubsampleFrac / (SubsampleWidth * 2.0f);
float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord); float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord);
float3 YTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x, Input.TexCoord.y)).rgb; float3 YTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x, Input.TexCoord.y)).rgb;
float3 ITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y, Input.TexCoord.y)).rgb; float3 ITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y, Input.TexCoord.y)).rgb;
float3 QTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z, Input.TexCoord.y)).rgb; float3 QTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z, Input.TexCoord.y)).rgb;
float3 LastYTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x - SubsampleFrac.x / RawWidth, Input.TexCoord.y)).rgb; float3 LastYTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x + YSubsampleLength / (RawWidth * 2.0f), Input.TexCoord.y)).rgb;
float3 LastITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y - SubsampleFrac.y / RawWidth, Input.TexCoord.y)).rgb; float3 LastITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y + ISubsampleLength / (RawWidth * 2.0f), Input.TexCoord.y)).rgb;
float3 LastQTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z - SubsampleFrac.z / RawWidth, Input.TexCoord.y)).rgb; float3 LastQTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z + QSubsampleLength / (RawWidth * 2.0f), Input.TexCoord.y)).rgb;
YTexel = lerp(LastYTexel, YTexel, SubsampleFrac.x); YTexel = lerp(YTexel, LastYTexel, SubsampleFrac.x);
ITexel = lerp(LastITexel, ITexel, SubsampleFrac.y); ITexel = lerp(ITexel, LastITexel, SubsampleFrac.y);
QTexel = lerp(LastQTexel, QTexel, SubsampleFrac.z); QTexel = lerp(QTexel, LastQTexel, SubsampleFrac.z);
// -- RGB Tint & Shift -- // -- RGB Tint & Shift --
float ShiftedRedY = dot(YTexel, float3(RedFromRed, RedFromGrn, RedFromBlu)); float ShiftedRedY = dot(YTexel, float3(RedFromRed, RedFromGrn, RedFromBlu));
@ -199,8 +198,8 @@ float4 ps_main(PS_INPUT Input) : COLOR
// -- Final Pixel -- // -- Final Pixel --
float4 Output = lerp(Input.Color, float4(OutRGB, BaseTexel.a) * Input.Color, Input.ExtraInfo.x); float4 Output = lerp(Input.Color, float4(OutRGB, BaseTexel.a) * Input.Color, Input.ExtraInfo.x);
return BaseTexel; return Output;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

29
hlsl/color_heavy.fx
View File

@ -129,26 +129,25 @@ uniform float QSubsampleLength = 3.0f;
float4 ps_main(PS_INPUT Input) : COLOR float4 ps_main(PS_INPUT Input) : COLOR
{ {
// -- Bandwidth Subsampling -- // -- Bandwidth Subsampling --
float YSubsampleWidth = (RawWidth * 2.0f) / YSubsampleLength; float3 SubsampleWidth = float3(YSubsampleLength, ISubsampleLength, QSubsampleLength);
float ISubsampleWidth = (RawWidth * 2.0f) / ISubsampleLength; SubsampleWidth = (RawWidth * 2.0f) / SubsampleWidth;
float QSubsampleWidth = (RawWidth * 2.0f) / QSubsampleLength; float3 SubsampleCoord = Input.TexCoord.x;
float3 SubsampleWidth = float3(YSubsampleWidth, ISubsampleWidth, QSubsampleWidth); float3 SubsampleFrac = frac(SubsampleCoord * SubsampleWidth); // Fraction is in subsample width units!
float3 SubsampleFrac = frac(Input.TexCoord.x * SubsampleWidth); SubsampleCoord = (SubsampleCoord * SubsampleWidth - SubsampleFrac) / SubsampleWidth;
float3 SubsampleCoord = (Input.TexCoord.x * SubsampleWidth - SubsampleFrac) / SubsampleWidth + SubsampleFrac / (SubsampleWidth * 2.0f);
float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord); float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord);
float3 YTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x, Input.TexCoord.y)).rgb; float3 YTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x, Input.TexCoord.y)).rgb;
float3 ITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y, Input.TexCoord.y)).rgb; float3 ITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y, Input.TexCoord.y)).rgb;
float3 QTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z, Input.TexCoord.y)).rgb; float3 QTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z, Input.TexCoord.y)).rgb;
float3 LastYTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x - SubsampleFrac.x / RawWidth, Input.TexCoord.y)).rgb; float3 LastYTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.x + YSubsampleLength / (RawWidth * 2.0f), Input.TexCoord.y)).rgb;
float3 LastITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y - SubsampleFrac.y / RawWidth, Input.TexCoord.y)).rgb; float3 LastITexel = tex2D(DiffuseSampler, float2(SubsampleCoord.y + ISubsampleLength / (RawWidth * 2.0f), Input.TexCoord.y)).rgb;
float3 LastQTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z - SubsampleFrac.z / RawWidth, Input.TexCoord.y)).rgb; float3 LastQTexel = tex2D(DiffuseSampler, float2(SubsampleCoord.z + QSubsampleLength / (RawWidth * 2.0f), Input.TexCoord.y)).rgb;
YTexel = lerp(LastYTexel, YTexel, SubsampleFrac.x); YTexel = lerp(YTexel, LastYTexel, SubsampleFrac.x);
ITexel = lerp(LastITexel, ITexel, SubsampleFrac.y); ITexel = lerp(ITexel, LastITexel, SubsampleFrac.y);
QTexel = lerp(LastQTexel, QTexel, SubsampleFrac.z); QTexel = lerp(QTexel, LastQTexel, SubsampleFrac.z);
// -- RGB Tint & Shift -- // -- RGB Tint & Shift --
float ShiftedRedY = dot(YTexel, float3(RedFromRed, RedFromGrn, RedFromBlu)); float ShiftedRedY = dot(YTexel, float3(RedFromRed, RedFromGrn, RedFromBlu));
@ -199,8 +198,8 @@ float4 ps_main(PS_INPUT Input) : COLOR
// -- Final Pixel -- // -- Final Pixel --
float4 Output = lerp(Input.Color, float4(OutRGB, BaseTexel.a) * Input.Color, Input.ExtraInfo.x); float4 Output = lerp(Input.Color, float4(OutRGB, BaseTexel.a) * Input.Color, Input.ExtraInfo.x);
return BaseTexel; return Output;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------