mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-02 19:13:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D) Cleanups

Browse Source
This commit is contained in:
twinaphex 2022-04-24 12:59:23 +02:00
parent 736f6eb8b6
commit fc2b3f1ed9
3 changed files with 24 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gfx/drivers/d3d10.c
View File

@ -245,13 +245,9 @@ static void d3d10_get_overlay_interface(void* data, const video_overlay_interfac
*iface = &overlay_interface;
}
static void d3d10_render_overlay(void *data)
static void d3d10_render_overlay(d3d10_video_t *d3d10)
{
unsigned i;
d3d10_video_t* d3d10 = (d3d10_video_t*)data;
if (!d3d10)
return;
if (d3d10->overlays.fullscreen)
D3D10SetViewports(d3d10->device, 1, &d3d10->viewport);
@ -305,29 +301,27 @@ static void d3d10_gfx_set_rotation(void* data, unsigned rotation)
D3D10UnmapBuffer(d3d10->frame.ubo);
}
static void d3d10_update_viewport(void* data, bool force_full)
static void d3d10_update_viewport(d3d10_video_t *d3d10, bool force_full)
{
d3d10_video_t* d3d10 = (d3d10_video_t*)data;
video_driver_update_viewport(&d3d10->vp, force_full, d3d10->keep_aspect);
d3d10->frame.viewport.TopLeftX = d3d10->vp.x;
d3d10->frame.viewport.TopLeftY = d3d10->vp.y;
d3d10->frame.viewport.Width = d3d10->vp.width;
d3d10->frame.viewport.Height = d3d10->vp.height;
d3d10->frame.viewport.MaxDepth = 0.0f;
d3d10->frame.viewport.MaxDepth = 1.0f;
d3d10->frame.viewport.TopLeftX = d3d10->vp.x;
d3d10->frame.viewport.TopLeftY = d3d10->vp.y;
d3d10->frame.viewport.Width = d3d10->vp.width;
d3d10->frame.viewport.Height = d3d10->vp.height;
d3d10->frame.viewport.MaxDepth = 0.0f;
d3d10->frame.viewport.MaxDepth = 1.0f;
if (d3d10->shader_preset && (d3d10->frame.output_size.x != d3d10->vp.width ||
d3d10->frame.output_size.y != d3d10->vp.height))
d3d10->resize_render_targets = true;
d3d10->frame.output_size.x = d3d10->vp.width;
d3d10->frame.output_size.y = d3d10->vp.height;
d3d10->frame.output_size.z = 1.0f / d3d10->vp.width;
d3d10->frame.output_size.w = 1.0f / d3d10->vp.height;
d3d10->frame.output_size.x = d3d10->vp.width;
d3d10->frame.output_size.y = d3d10->vp.height;
d3d10->frame.output_size.z = 1.0f / d3d10->vp.width;
d3d10->frame.output_size.w = 1.0f / d3d10->vp.height;
d3d10->resize_viewport = false;
d3d10->resize_viewport = false;
}
static void d3d10_free_shader_preset(d3d10_video_t* d3d10)

12
gfx/drivers/d3d11.c
View File

@ -267,13 +267,9 @@ static void d3d11_get_overlay_interface(
*iface = &overlay_interface;
}
static void d3d11_render_overlay(void *data)
static void d3d11_render_overlay(d3d11_video_t *d3d11)
{
unsigned i;
d3d11_video_t* d3d11 = (d3d11_video_t*)data;
if (!d3d11)
return;
if (d3d11->overlays.fullscreen)
d3d11->context->lpVtbl->RSSetViewports(d3d11->context, 1, &d3d11->viewport);
@ -445,10 +441,8 @@ static void d3d11_gfx_set_rotation(void* data, unsigned rotation)
d3d11->context->lpVtbl->Unmap(d3d11->context, (D3D11Resource)d3d11->frame.ubo, 0);
}
static void d3d11_update_viewport(void* data, bool force_full)
static void d3d11_update_viewport(d3d11_video_t *d3d11, bool force_full)
{
d3d11_video_t* d3d11 = (d3d11_video_t*)data;
video_driver_update_viewport(&d3d11->vp, force_full, d3d11->keep_aspect);
d3d11->frame.viewport.TopLeftX = d3d11->vp.x;
@ -467,7 +461,7 @@ static void d3d11_update_viewport(void* data, bool force_full)
d3d11->frame.output_size.z = 1.0f / d3d11->vp.width;
d3d11->frame.output_size.w = 1.0f / d3d11->vp.height;
d3d11->resize_viewport = false;
d3d11->resize_viewport = false;
}
static void d3d11_free_shader_preset(d3d11_video_t* d3d11)

22
gfx/drivers/d3d12.c
View File

@ -106,8 +106,8 @@ d3d12_overlay_vertex_geom(void* data, unsigned index, float x, float y, float w,
sprites[index].pos.w = w;
sprites[index].pos.h = h;
range.Begin = index * sizeof(*sprites);
range.End = range.Begin + sizeof(*sprites);
range.Begin = index * sizeof(*sprites);
range.End = range.Begin + sizeof(*sprites);
D3D12Unmap(d3d12->overlays.vbo, 0, &range);
}
@ -127,8 +127,8 @@ static void d3d12_overlay_tex_geom(void* data, unsigned index, float u, float v,
sprites[index].coords.w = w;
sprites[index].coords.h = h;
range.Begin = index * sizeof(*sprites);
range.End = range.Begin + sizeof(*sprites);
range.Begin = index * sizeof(*sprites);
range.End = range.Begin + sizeof(*sprites);
D3D12Unmap(d3d12->overlays.vbo, 0, &range);
}
@ -148,8 +148,8 @@ static void d3d12_overlay_set_alpha(void* data, unsigned index, float mod)
sprites[index].colors[2] = sprites[index].colors[0];
sprites[index].colors[3] = sprites[index].colors[0];
range.Begin = index * sizeof(*sprites);
range.End = range.Begin + sizeof(*sprites);
range.Begin = index * sizeof(*sprites);
range.End = range.Begin + sizeof(*sprites);
D3D12Unmap(d3d12->overlays.vbo, 0, &range);
}
@ -244,13 +244,9 @@ static void d3d12_get_overlay_interface(void* data, const video_overlay_interfac
*iface = &overlay_interface;
}
static void d3d12_render_overlay(void* data)
static void d3d12_render_overlay(d3d12_video_t *d3d12)
{
unsigned i;
d3d12_video_t* d3d12 = (d3d12_video_t*)data;
if (!d3d12)
return;
if (d3d12->overlays.fullscreen)
{
@ -414,10 +410,8 @@ static void d3d12_gfx_set_rotation(void* data, unsigned rotation)
D3D12Unmap(d3d12->frame.ubo, 0, NULL);
}
static void d3d12_update_viewport(void* data, bool force_full)
static void d3d12_update_viewport(d3d12_video_t *d3d12, bool force_full)
{
d3d12_video_t* d3d12 = (d3d12_video_t*)data;
video_driver_update_viewport(&d3d12->vp, force_full, d3d12->keep_aspect);
d3d12->frame.viewport.TopLeftX = d3d12->vp.x;