Miroirs/mame
1
0
Fork 0
mirror of https://github.com/mamedev/mame.git synced 2024-11-16 07:48:32 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fixing multiscreen games, nwn

Browse source
This commit is contained in:
Ryan Holtz 2011-05-22 02:27:31 +00:00
parent 2cd23c1476
commit 53e20c168f
5 changed files with 74 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hlsl/color.fx
View file

@ -136,7 +136,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
// -- 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);
return float4(OutRGB, 1.0f);
return float4(OutRGB, BaseTexel.a);
}
//-----------------------------------------------------------------------------

3
hlsl/deconverge.fx
View file

@ -113,11 +113,12 @@ float4 ps_main(PS_INPUT Input) : COLOR
float MagnetDistance = length((MagnetCenter - Input.TexCoord) * float2(WidthRatio, HeightRatio));
float Deconverge = 1.0f - MagnetDistance / MagnetCenter;
Deconverge = clamp(Deconverge, 0.0f, 1.0f);
float Alpha = tex2D(DiffuseSampler, Input.TexCoord).a;
float RedTexel = tex2D(DiffuseSampler, lerp(Input.TexCoord, Input.RedCoord, Deconverge)).r;
float GrnTexel = tex2D(DiffuseSampler, lerp(Input.TexCoord, Input.GrnCoord, Deconverge)).g;
float BluTexel = tex2D(DiffuseSampler, lerp(Input.TexCoord, Input.BluCoord, Deconverge)).b;
return float4(RedTexel, GrnTexel, BluTexel, 1.0f);
return float4(RedTexel, GrnTexel, BluTexel, Alpha);
}
//-----------------------------------------------------------------------------

8
hlsl/focus.fx
View file

@ -111,7 +111,7 @@ VS_OUTPUT vs_main(VS_INPUT Input)
float4 ps_main(PS_INPUT Input) : COLOR
{
float3 d0 = tex2D(DiffuseSampler, Input.TexCoord0).rgb;
float4 d0 = tex2D(DiffuseSampler, Input.TexCoord0);
float3 d1 = tex2D(DiffuseSampler, Input.TexCoord1).rgb;
float3 d2 = tex2D(DiffuseSampler, Input.TexCoord2).rgb;
float3 d3 = tex2D(DiffuseSampler, Input.TexCoord3).rgb;
@ -120,10 +120,10 @@ float4 ps_main(PS_INPUT Input) : COLOR
float3 d6 = tex2D(DiffuseSampler, Input.TexCoord6).rgb;
float3 d7 = tex2D(DiffuseSampler, Input.TexCoord7).rgb;
float3 blurred = (d0 + d1 + d2 + d3 + d4 + d5 + d6 + d7) / 8.0f;
float3 blurred = (d0.rgb + d1 + d2 + d3 + d4 + d5 + d6 + d7) / 8.0f;
blurred = lerp(d0, blurred, 1.0f);
return float4(blurred, 1.0f);
blurred = lerp(d0.rgb, blurred, 1.0f);
return float4(blurred, d0.a);
}
//-----------------------------------------------------------------------------

18
hlsl/yiq_decode.fx
View file

@ -2,9 +2,22 @@
// YIQ Decode Effect
//-----------------------------------------------------------------------------
texture Diffuse;
texture Composite;
sampler CompositeSampler = sampler_state
{
Texture = <Composite>;
MipFilter = POINT;
MinFilter = POINT;
MagFilter = POINT;
AddressU = CLAMP;
AddressV = CLAMP;
AddressW = CLAMP;
};
texture Diffuse;
sampler DiffuseSampler = sampler_state
{
Texture = <Diffuse>;
MipFilter = POINT;
@ -110,6 +123,7 @@ uniform float BValue;
float4 ps_main(PS_INPUT Input) : COLOR
{
float2 RawDims = float2(RawWidth, RawHeight);
float4 BaseTexel = tex2D(DiffuseSampler, Input.Coord0.xy);
float4 OrigC = tex2D(CompositeSampler, Input.Coord0.xy);
float4 OrigC2 = tex2D(CompositeSampler, Input.Coord4.xy);
float4 C = OrigC;
@ -176,7 +190,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
float3 OutRGB = float3(dot(YIQ, float3(1.0f, 0.9563f, 0.6210f)), dot(YIQ, float3(1.0f, -0.2721f, -0.6474f)), dot(YIQ, float3(1.0f, -1.1070f, 1.7046f)));
return float4(OutRGB, 1.0f);
return float4(OutRGB, BaseTexel.a);
}
//-----------------------------------------------------------------------------

58
src/osd/windows/drawd3d.c
View file

@ -729,7 +729,7 @@ static int drawd3d_window_draw(win_window_info *window, HDC dc, int update)
mtlog_add("drawd3d_window_draw: begin");
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(255,0,0,0), 0, 0);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0,0,0,0), 0, 0);
if(result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device clear call\n", (int)result);
// first update any textures
@ -967,30 +967,75 @@ try_again:
// create the regular shader
result = (*d3dintf->device.create_effect)(d3d->device, primary_name, &d3d->effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load primary.fx\n");
return 1;
}
// create the post-processing shader
result = (*d3dintf->device.create_effect)(d3d->device, post_name, &d3d->post_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load post.fx\n");
return 1;
}
// create the pincushion shader
result = (*d3dintf->device.create_effect)(d3d->device, pincushion_name, &d3d->pincushion_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load pincushion.fx\n");
return 1;
}
// create the phosphor shader
result = (*d3dintf->device.create_effect)(d3d->device, phosphor_name, &d3d->phosphor_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load phosphor.fx\n");
return 1;
}
// create the focus shader
result = (*d3dintf->device.create_effect)(d3d->device, focus_name, &d3d->focus_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load focus.fx\n");
return 1;
}
// create the deconvergence shader
result = (*d3dintf->device.create_effect)(d3d->device, deconverge_name, &d3d->deconverge_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load deconverge.fx\n");
return 1;
}
// create the color convolution shader
result = (*d3dintf->device.create_effect)(d3d->device, color_name, &d3d->color_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load color.fx\n");
return 1;
}
// create the YIQ modulation shader
result = (*d3dintf->device.create_effect)(d3d->device, yiq_encode_name, &d3d->yiq_encode_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load yiq_encode.fx\n");
return 1;
}
// create the YIQ demodulation shader
result = (*d3dintf->device.create_effect)(d3d->device, yiq_decode_name, &d3d->yiq_decode_effect);
if(result != D3D_OK)
{
mame_printf_verbose("Direct3D: Unable to load yiq_decode.fx\n");
return 1;
}
if (primary_name)
osd_free(primary_name);
@ -2216,7 +2261,7 @@ static void primitive_flush_pending(d3d_info *d3d)
result = (*d3dintf->device.set_render_target)(d3d->device, 0, poly->texture->d3dtarget4);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device set_render_target call\n", (int)result);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(255,0,0,0), 0, 0);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0,0,0,0), 0, 0);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device clear call\n", (int)result);
(*d3dintf->effect.begin)(curr_effect, &num_passes, 0);
@ -2235,7 +2280,8 @@ static void primitive_flush_pending(d3d_info *d3d)
/* Convert our signal from YIQ */
curr_effect = d3d->yiq_decode_effect;
(*d3dintf->effect.set_texture)(curr_effect, "Diffuse", poly->texture->d3dtexture4);
(*d3dintf->effect.set_texture)(curr_effect, "Composite", poly->texture->d3dtexture4);
(*d3dintf->effect.set_texture)(curr_effect, "Diffuse", poly->texture->d3dfinaltex);
(*d3dintf->effect.set_float)(curr_effect, "RawWidth", poly->texture != NULL ? (float)poly->texture->rawwidth : 8.0f);
(*d3dintf->effect.set_float)(curr_effect, "RawHeight", poly->texture != NULL ? (float)poly->texture->rawheight : 8.0f);
(*d3dintf->effect.set_float)(curr_effect, "WidthRatio", poly->texture != NULL ? (1.0f / (poly->texture->ustop - poly->texture->ustart)) : 0.0f);
@ -2250,7 +2296,7 @@ static void primitive_flush_pending(d3d_info *d3d)
result = (*d3dintf->device.set_render_target)(d3d->device, 0, poly->texture->d3dtarget3);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device set_render_target call\n", (int)result);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(255,0,0,0), 0, 0);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0,0,0,0), 0, 0);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device clear call\n", (int)result);
(*d3dintf->effect.begin)(curr_effect, &num_passes, 0);
@ -2307,7 +2353,7 @@ static void primitive_flush_pending(d3d_info *d3d)
result = (*d3dintf->device.set_render_target)(d3d->device, 0, poly->texture->d3dsmalltarget0);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device set_render_target call\n", (int)result);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(255,0,0,0), 0, 0);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0,0,0,0), 0, 0);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device clear call\n", (int)result);
(*d3dintf->effect.begin)(curr_effect, &num_passes, 0);
@ -2500,8 +2546,6 @@ static void primitive_flush_pending(d3d_info *d3d)
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);
result = (*d3dintf->device.clear)(d3d->device, 0, NULL, D3DCLEAR_TARGET, D3DCOLOR_ARGB(0,0,0,0), 0, 0);
if (result != D3D_OK) mame_printf_verbose("Direct3D: Error %08X during device clear call\n", (int)result);
(*d3dintf->effect.begin)(curr_effect, &num_passes, 0);