Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-05 08:41:31 +03:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix for -noyiq issues, nw

Browse Source
This commit is contained in:
Ryan Holtz 2011-05-20 07:51:59 +00:00
parent fd7a110eba
commit 0235cef534
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
hlsl/color.fx
View File

@ -69,9 +69,7 @@ VS_OUTPUT vs_main(VS_INPUT Input)
Output.Position.y -= 0.5f; Output.Position.y -= 0.5f;
Output.Position *= float4(2.0f, 2.0f, 1.0f, 1.0f); Output.Position *= float4(2.0f, 2.0f, 1.0f, 1.0f);
Output.Color = Input.Color; Output.Color = Input.Color;
float2 InvTexSize = float2(1.0f / TargetWidth, 1.0f / TargetHeight); Output.TexCoord = Input.TexCoord;
float2 TexCoord = (Input.Position.xy * InvTexSize) / float2(WidthRatio, HeightRatio);
Output.TexCoord = lerp(Input.TexCoord, TexCoord, YIQEnable);
Output.ExtraInfo = Input.ExtraInfo; Output.ExtraInfo = Input.ExtraInfo;
return Output; return Output;
@ -111,7 +109,7 @@ uniform float BluPower = 2.2f;
float4 ps_main(PS_INPUT Input) : COLOR float4 ps_main(PS_INPUT Input) : COLOR
{ {
float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord); float4 BaseTexel = tex2D(DiffuseSampler, Input.TexCoord - 0.5f / float2(RawWidth, RawHeight));
float3 OutRGB = BaseTexel.rgb; float3 OutRGB = BaseTexel.rgb;
@ -138,10 +136,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
// -- Color Compression (increasing the floor of the signal without affecting the ceiling) -- // -- Color Compression (increasing the floor of the signal without affecting the ceiling) --
OutRGB = float3(RedFloor + (1.0f - RedFloor) * OutRGB.r, GrnFloor + (1.0f - GrnFloor) * OutRGB.g, BluFloor + (1.0f - BluFloor) * OutRGB.b); OutRGB = float3(RedFloor + (1.0f - RedFloor) * OutRGB.r, GrnFloor + (1.0f - GrnFloor) * OutRGB.g, BluFloor + (1.0f - BluFloor) * OutRGB.b);
// -- Final Pixel -- return float4(OutRGB, 1.0f);
float4 Output = lerp(Input.Color, float4(OutRGB, BaseTexel.a) * Input.Color, Input.ExtraInfo.x);
return Output;
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------

2
src/osd/windows/drawd3d.c
View File

@ -2495,7 +2495,7 @@ static void primitive_flush_pending(d3d_info *d3d)
/* Scanlines and shadow mask */ /* Scanlines and shadow mask */
curr_effect = d3d->post_effect; curr_effect = d3d->post_effect;
(*d3dintf->effect.set_texture)(curr_effect, "Diffuse", poly->texture->d3dtexture3); (*d3dintf->effect.set_texture)(curr_effect, "Diffuse", poly->texture->d3dtexture0);
result = (*d3dintf->device.set_render_target)(d3d->device, 0, backbuffer); result = (*d3dintf->device.set_render_target)(d3d->device, 0, backbuffer);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device set_render_target call 5\n", (int)result); if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device set_render_target call 5\n", (int)result);