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

More D3D HLSL regression fixes: (#11002) [Ryan Holtz]

Browse source 
* hlsl/post.fx: Fixed double-drawing of screen data with D3D9 HLSL and screen scale/offset.
* render/d3d/d3dhlsl.cpp: Fixed screen-container search function (fixes GitHub #10872).
* render/d3d/d3dhlsl.cpp: Fixed downsample pass, fixes blocky vector bloom.
This commit is contained in:
MooglyGuy 2023-03-19 16:22:34 +01:00 committed by GitHub
parent a8e9da5cf0
commit f05ea5b7b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hlsl/post.fx
View file

@ -211,7 +211,7 @@ float4 ps_main(PS_INPUT Input) : COLOR
if (BaseCoord.x < 0.0 || BaseCoord.y < 0.0 || if (BaseCoord.x < 0.0 || BaseCoord.y < 0.0 ||
BaseCoord.x > 1.0 || BaseCoord.y > 1.0) BaseCoord.x > 1.0 || BaseCoord.y > 1.0)
{ {
discard; return float4(0.0f, 0.0f, 0.0f, 1.0f);
} }
// Color Compression (may not affect bloom) // Color Compression (may not affect bloom)

10
src/osd/modules/render/d3d/d3dhlsl.cpp
View file

@ -584,9 +584,9 @@ void shaders::begin_frame(render_primitive_list *primlist)
{ {
if (PRIMFLAG_GET_SCREENTEX(prim.flags)) if (PRIMFLAG_GET_SCREENTEX(prim.flags))
{ {
containers[num_targets] = prim.container;
int screen_index = 0; int screen_index = 0;
for (; screen_index < num_screens && containers[screen_index] != prim.container; screen_index++); for (; screen_index < num_screens && containers[screen_index] != prim.container; screen_index++);
containers[screen_index] = prim.container;
target_to_screen[num_targets] = screen_index; target_to_screen[num_targets] = screen_index;
targets_per_screen[screen_index]++; targets_per_screen[screen_index]++;
if (screen_index >= num_screens) if (screen_index >= num_screens)
@ -958,7 +958,6 @@ void shaders::begin_draw()
return; return;
curr_target = 0; curr_target = 0;
curr_effect = default_effect.get();
// Update for delta_time // Update for delta_time
const double t = machine->time().as_double(); const double t = machine->time().as_double();
@ -990,6 +989,8 @@ void shaders::begin_draw()
{ {
osd_printf_verbose("Direct3D: Error %08lX during device SetRenderTarget call\n", result); osd_printf_verbose("Direct3D: Error %08lX during device SetRenderTarget call\n", result);
} }
set_curr_effect(default_effect.get());
} }
@ -1003,7 +1004,7 @@ void shaders::set_curr_effect(effect *curr_effect)
{ {
return; return;
} }
if (this->curr_effect->is_active()) if (this->curr_effect && this->curr_effect->is_active())
{ {
this->curr_effect->end(); this->curr_effect->end();
} }
@ -1350,10 +1351,10 @@ int shaders::downsample_pass(d3d_render_target *rt, int source_index, poly_info
} }
set_curr_effect(downsample_effect.get()); set_curr_effect(downsample_effect.get());
curr_effect->update_uniforms();
for (int bloom_index = 0; bloom_index < rt->bloom_count; bloom_index++) for (int bloom_index = 0; bloom_index < rt->bloom_count; bloom_index++)
{ {
curr_effect->update_uniforms();
curr_effect->set_vector("TargetDims", 2, rt->bloom_dims[bloom_index]); curr_effect->set_vector("TargetDims", 2, rt->bloom_dims[bloom_index]);
curr_effect->set_texture("DiffuseTexture", curr_effect->set_texture("DiffuseTexture",
bloom_index == 0 bloom_index == 0
@ -1361,6 +1362,7 @@ int shaders::downsample_pass(d3d_render_target *rt, int source_index, poly_info
: rt->bloom_texture[bloom_index - 1].Get()); : rt->bloom_texture[bloom_index - 1].Get());
blit(rt->bloom_surface[bloom_index].Get(), false, D3DPT_TRIANGLELIST, 0, 2); blit(rt->bloom_surface[bloom_index].Get(), false, D3DPT_TRIANGLELIST, 0, 2);
downsample_effect->end();
} }
return next_index; return next_index;