ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(D3D11) correct the size data of the last pass.

This commit is contained in:
aliaspider 2018-02-01 20:56:40 +01:00
parent 8db625dd59
commit 461a936eb4
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
gfx/drivers/d3d11.c
View File

@ -128,6 +128,8 @@ static bool d3d11_gfx_set_shader(void* data, enum rarch_shader_type type, const
D3D11Flush(d3d11->ctx); D3D11Flush(d3d11->ctx);
d3d11_free_shader_preset(d3d11); d3d11_free_shader_preset(d3d11);
d3d11->resize_fbos = true;
if (!path) if (!path)
return true; return true;
@ -709,8 +711,7 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
switch (pass->fbo.type_x) switch (pass->fbo.type_x)
{ {
case RARCH_SCALE_INPUT: case RARCH_SCALE_INPUT:
if (pass->fbo.scale_x) width *= pass->fbo.scale_x;
width *= pass->fbo.scale_x;
break; break;
case RARCH_SCALE_VIEWPORT: case RARCH_SCALE_VIEWPORT:
@ -728,8 +729,7 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
switch (pass->fbo.type_y) switch (pass->fbo.type_y)
{ {
case RARCH_SCALE_INPUT: case RARCH_SCALE_INPUT:
if (pass->fbo.scale_y) height *= pass->fbo.scale_y;
height *= pass->fbo.scale_y;
break; break;
case RARCH_SCALE_VIEWPORT: case RARCH_SCALE_VIEWPORT:
@ -750,17 +750,18 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
if (!height) if (!height)
height = d3d11->vp.height; height = d3d11->vp.height;
d3d11->pass[i].viewport.Width = width; RARCH_LOG("[D3D11]: Updating framebuffer size %u x %u.\n", width, height);
d3d11->pass[i].viewport.Height = height;
d3d11->pass[i].viewport.MaxDepth = 1.0;
d3d11->pass[i].rt.desc.Width = width;
d3d11->pass[i].rt.desc.Height = height;
d3d11->pass[i].rt.desc.BindFlags = D3D11_BIND_RENDER_TARGET;
d3d11->pass[i].rt.desc.Format = glslang_format_to_dxgi(d3d11->pass[i].semantics.format);
if ((i != (d3d11->shader_preset->passes - 1)) || (width != d3d11->vp.width) || if ((i != (d3d11->shader_preset->passes - 1)) || (width != d3d11->vp.width) ||
(height != d3d11->vp.height)) (height != d3d11->vp.height))
{ {
d3d11->pass[i].viewport.Width = width;
d3d11->pass[i].viewport.Height = height;
d3d11->pass[i].viewport.MaxDepth = 1.0;
d3d11->pass[i].rt.desc.Width = width;
d3d11->pass[i].rt.desc.Height = height;
d3d11->pass[i].rt.desc.BindFlags = D3D11_BIND_RENDER_TARGET;
d3d11->pass[i].rt.desc.Format = glslang_format_to_dxgi(d3d11->pass[i].semantics.format);
d3d11_init_texture(d3d11->device, &d3d11->pass[i].rt); d3d11_init_texture(d3d11->device, &d3d11->pass[i].rt);
} }
else else
@ -787,6 +788,7 @@ static bool d3d11_init_frame_textures(d3d11_video_t* d3d11, unsigned width, unsi
} }
d3d11->resize_fbos = false; d3d11->resize_fbos = false;
return true; return true;
#if 0 #if 0
error: error:
@ -844,6 +846,9 @@ static bool d3d11_gfx_frame(
if (frame && width && height) if (frame && width && height)
{ {
if (d3d11->frame.texture.desc.Width != width || d3d11->frame.texture.desc.Height != height) if (d3d11->frame.texture.desc.Width != width || d3d11->frame.texture.desc.Height != height)
d3d11->resize_fbos = true;
if (d3d11->resize_fbos)
d3d11_init_frame_textures(d3d11, width, height); d3d11_init_frame_textures(d3d11, width, height);
d3d11_update_texture( d3d11_update_texture(
@ -853,10 +858,6 @@ static bool d3d11_gfx_frame(
D3D11SetVertexBuffer(d3d11->ctx, 0, d3d11->frame.vbo, sizeof(d3d11_vertex_t), 0); D3D11SetVertexBuffer(d3d11->ctx, 0, d3d11->frame.vbo, sizeof(d3d11_vertex_t), 0);
D3D11SetBlendState(d3d11->ctx, d3d11->blend_disable, NULL, D3D11_DEFAULT_SAMPLE_MASK); D3D11SetBlendState(d3d11->ctx, d3d11->blend_disable, NULL, D3D11_DEFAULT_SAMPLE_MASK);
/* todo: single pass shaders can also have an empty rt texture */
if (d3d11->shader_preset && (d3d11->resize_fbos || !d3d11->pass[0].rt.handle))
d3d11_init_frame_textures(d3d11, width, height);
d3d11_texture_t* texture = &d3d11->frame.texture; d3d11_texture_t* texture = &d3d11->frame.texture;
if (d3d11->shader_preset) if (d3d11->shader_preset)