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

Merge pull request #11392 from stenzek/d3d11

Browse Source 
(video/d3d11) Fix background in menus, and shaders for hardware renderers
This commit is contained in:
Autechre 2020-09-30 17:57:27 +02:00 committed by GitHub
commit 7f3b1c69e3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 42 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
gfx/common/d3d11_common.h
View File

@ -2568,12 +2568,13 @@ typedef struct
struct struct
{ {
d3d11_texture_t texture[GFX_MAX_FRAME_HISTORY + 1]; d3d11_texture_t texture[GFX_MAX_FRAME_HISTORY + 1];
D3D11Buffer vbo; D3D11ShaderResourceView last_texture_view;
D3D11Buffer ubo; D3D11Buffer vbo;
D3D11_VIEWPORT viewport; D3D11Buffer ubo;
float4_t output_size; D3D11_VIEWPORT viewport;
int rotation; float4_t output_size;
int rotation;
} frame; } frame;
struct struct

59
gfx/drivers/d3d11.c
View File

@ -374,9 +374,10 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
{ {
#if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS) #if defined(HAVE_SLANG) && defined(HAVE_SPIRV_CROSS)
unsigned i; unsigned i;
config_file_t* conf = NULL; config_file_t* conf = NULL;
d3d11_texture_t* source = NULL; d3d11_texture_t* source = NULL;
d3d11_video_t* d3d11 = (d3d11_video_t*)data; D3D11ShaderResourceView* source_view_ptr = NULL;
d3d11_video_t* d3d11 = (d3d11_video_t*)data;
if (!d3d11) if (!d3d11)
return false; return false;
@ -402,7 +403,8 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
goto error; goto error;
source = &d3d11->frame.texture[0]; source = &d3d11->frame.texture[0];
for (i = 0; i < d3d11->shader_preset->passes; source = &d3d11->pass[i++].rt) source_view_ptr = &d3d11->frame.last_texture_view;
for (i = 0; i < d3d11->shader_preset->passes; source = &d3d11->pass[i++].rt, source_view_ptr = &source->view)
{ {
unsigned j; unsigned j;
/* clang-format off */ /* clang-format off */
@ -413,7 +415,7 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
&d3d11->frame.texture[0].size_data, 0}, &d3d11->frame.texture[0].size_data, 0},
/* Source */ /* Source */
{ &source->view, 0, { source_view_ptr, 0,
&source->size_data, 0}, &source->size_data, 0},
/* OriginalHistory */ /* OriginalHistory */
@ -573,6 +575,7 @@ static void d3d11_gfx_free(void* data)
d3d11_free_shader_preset(d3d11); d3d11_free_shader_preset(d3d11);
d3d11_release_texture(&d3d11->frame.texture[0]); d3d11_release_texture(&d3d11->frame.texture[0]);
Release(d3d11->frame.last_texture_view);
Release(d3d11->frame.ubo); Release(d3d11->frame.ubo);
Release(d3d11->frame.vbo); Release(d3d11->frame.vbo);
@ -1301,17 +1304,17 @@ static bool d3d11_gfx_frame(
video_frame_info_t* video_info) video_frame_info_t* video_info)
{ {
unsigned i; unsigned i;
d3d11_texture_t* texture = NULL; D3D11ShaderResourceView texture = NULL;
d3d11_video_t* d3d11 = (d3d11_video_t*)data; d3d11_video_t* d3d11 = (d3d11_video_t*)data;
D3D11DeviceContext context = d3d11->context; D3D11DeviceContext context = d3d11->context;
const char *stat_text = video_info->stat_text; const char *stat_text = video_info->stat_text;
unsigned video_width = video_info->width; unsigned video_width = video_info->width;
unsigned video_height = video_info->height; unsigned video_height = video_info->height;
bool statistics_show = video_info->statistics_show; bool statistics_show = video_info->statistics_show;
struct font_params* osd_params = (struct font_params*)&video_info->osd_stat_params; struct font_params* osd_params = (struct font_params*)&video_info->osd_stat_params;
bool menu_is_alive = video_info->menu_is_alive; bool menu_is_alive = video_info->menu_is_alive;
#ifdef HAVE_GFX_WIDGETS #ifdef HAVE_GFX_WIDGETS
bool widgets_active = video_info->widgets_active; bool widgets_active = video_info->widgets_active;
#endif #endif
if (d3d11->resize_chain) if (d3d11->resize_chain)
@ -1408,14 +1411,27 @@ static bool d3d11_gfx_frame(
d3d11_init_render_targets(d3d11, width, height); d3d11_init_render_targets(d3d11, width, height);
if (frame != RETRO_HW_FRAME_BUFFER_VALID) if (frame != RETRO_HW_FRAME_BUFFER_VALID)
{
d3d11_update_texture( d3d11_update_texture(
context, width, height, pitch, d3d11->format, frame, &d3d11->frame.texture[0]); context, width, height, pitch, d3d11->format, frame, &d3d11->frame.texture[0]);
Release(d3d11->frame.last_texture_view);
d3d11->frame.last_texture_view = d3d11->frame.texture[0].view;
AddRef(d3d11->frame.last_texture_view);
}
else if (d3d11->hw.enable)
{
// Retrieve the currently-bound texture from the context and cache it, in case the next frame is duped.
Release(d3d11->frame.last_texture_view);
// GetPSShaderResources() increments the reference count for the returned view.
D3D11GetPShaderResources(d3d11->context, 0, 1, &d3d11->frame.last_texture_view);
}
} }
D3D11SetVertexBuffer(context, 0, d3d11->frame.vbo, sizeof(d3d11_vertex_t), 0); D3D11SetVertexBuffer(context, 0, d3d11->frame.vbo, sizeof(d3d11_vertex_t), 0);
D3D11SetBlendState(context, d3d11->blend_disable, NULL, D3D11_DEFAULT_SAMPLE_MASK); D3D11SetBlendState(context, d3d11->blend_disable, NULL, D3D11_DEFAULT_SAMPLE_MASK);
texture = d3d11->frame.texture; texture = d3d11->frame.last_texture_view;
if (d3d11->shader_preset) if (d3d11->shader_preset)
{ {
@ -1492,11 +1508,7 @@ static bool d3d11_gfx_frame(
texture_sem++; texture_sem++;
} }
if (d3d11->hw.enable && (i == 0)) D3D11SetPShaderResources(context, 0, SLANG_NUM_BINDINGS, textures);
D3D11SetPShaderResources(context, 1, SLANG_NUM_BINDINGS - 1, textures + 1);
else
D3D11SetPShaderResources(context, 0, SLANG_NUM_BINDINGS, textures);
D3D11SetPShaderSamplers(context, 0, SLANG_NUM_BINDINGS, samplers); D3D11SetPShaderSamplers(context, 0, SLANG_NUM_BINDINGS, samplers);
} }
@ -1513,7 +1525,7 @@ static bool d3d11_gfx_frame(
D3D11SetViewports(context, 1, &d3d11->pass[i].viewport); D3D11SetViewports(context, 1, &d3d11->pass[i].viewport);
D3D11Draw(context, 4, 0); D3D11Draw(context, 4, 0);
texture = &d3d11->pass[i].rt; texture = d3d11->pass[i].rt.view;
} }
D3D11SetRenderTargets(context, 1, &d3d11->renderTargetView, NULL); D3D11SetRenderTargets(context, 1, &d3d11->renderTargetView, NULL);
} }
@ -1521,8 +1533,7 @@ static bool d3d11_gfx_frame(
if (texture) if (texture)
{ {
d3d11_set_shader(context, &d3d11->shaders[VIDEO_SHADER_STOCK_BLEND]); d3d11_set_shader(context, &d3d11->shaders[VIDEO_SHADER_STOCK_BLEND]);
if (!d3d11->hw.enable || d3d11->shader_preset) D3D11SetPShaderResources(context, 0, 1, &texture);
D3D11SetPShaderResources(context, 0, 1, &texture->view);
D3D11SetPShaderSamplers( D3D11SetPShaderSamplers(
context, 0, 1, &d3d11->samplers[RARCH_FILTER_UNSPEC][RARCH_WRAP_DEFAULT]); context, 0, 1, &d3d11->samplers[RARCH_FILTER_UNSPEC][RARCH_WRAP_DEFAULT]);
D3D11SetVShaderConstantBuffers(context, 0, 1, &d3d11->frame.ubo); D3D11SetVShaderConstantBuffers(context, 0, 1, &d3d11->frame.ubo);