mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D11/12) fix dialogbox / gradient.

Browse Source
This commit is contained in:
aliaspider 2018-02-08 17:11:24 +01:00
parent 0d88799e6d
commit 97813b9722
5 changed files with 180 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
gfx/common/d3d12_common.h
View File

@ -20,6 +20,8 @@
#include "dxgi_common.h" #include "dxgi_common.h"
#include <d3d12.h> #include <d3d12.h>
typedef const ID3D12PipelineState* D3D12PipelineStateRef;
/* auto-generated */ /* auto-generated */
typedef ID3D12Object* D3D12Object; typedef ID3D12Object* D3D12Object;
@ -318,9 +320,9 @@ D3D12OMSetStencilRef(D3D12GraphicsCommandList graphics_command_list, UINT stenci
graphics_command_list->lpVtbl->OMSetStencilRef(graphics_command_list, stencil_ref); graphics_command_list->lpVtbl->OMSetStencilRef(graphics_command_list, stencil_ref);
} }
static INLINE void D3D12SetPipelineState( static INLINE void D3D12SetPipelineState(
D3D12GraphicsCommandList graphics_command_list, D3D12PipelineState pipeline_state) D3D12GraphicsCommandList graphics_command_list, D3D12PipelineStateRef pipeline_state)
{ {
graphics_command_list->lpVtbl->SetPipelineState(graphics_command_list, pipeline_state); graphics_command_list->lpVtbl->SetPipelineState(graphics_command_list, (D3D12PipelineState)pipeline_state);
} }
static INLINE void D3D12ResourceBarrier( static INLINE void D3D12ResourceBarrier(
D3D12GraphicsCommandList graphics_command_list, D3D12GraphicsCommandList graphics_command_list,
@ -1396,7 +1398,9 @@ typedef struct
struct struct
{ {
D3D12PipelineState pipe; D3D12PipelineStateRef pipe;
D3D12PipelineState pipe_blend;
D3D12PipelineState pipe_noblend;
D3D12PipelineState pipe_font; D3D12PipelineState pipe_font;
D3D12Resource vbo; D3D12Resource vbo;
D3D12_VERTEX_BUFFER_VIEW vbo_view; D3D12_VERTEX_BUFFER_VIEW vbo_view;

4
gfx/drivers/d3d11.c
View File

@ -1261,13 +1261,13 @@ static uintptr_t d3d11_gfx_load_texture(
texture->desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS; texture->desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS;
/* fallthrough */ /* fallthrough */
case TEXTURE_FILTER_LINEAR: case TEXTURE_FILTER_LINEAR:
texture->sampler = d3d11->samplers[RARCH_FILTER_LINEAR][RARCH_WRAP_DEFAULT]; texture->sampler = d3d11->samplers[RARCH_FILTER_LINEAR][RARCH_WRAP_EDGE];
break; break;
case TEXTURE_FILTER_MIPMAP_NEAREST: case TEXTURE_FILTER_MIPMAP_NEAREST:
texture->desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS; texture->desc.MiscFlags = D3D11_RESOURCE_MISC_GENERATE_MIPS;
/* fallthrough */ /* fallthrough */
case TEXTURE_FILTER_NEAREST: case TEXTURE_FILTER_NEAREST:
texture->sampler = d3d11->samplers[RARCH_FILTER_NEAREST][RARCH_WRAP_DEFAULT]; texture->sampler = d3d11->samplers[RARCH_FILTER_NEAREST][RARCH_WRAP_EDGE];
break; break;
} }

18
gfx/drivers/d3d12.c
View File

@ -162,13 +162,18 @@ static bool d3d12_gfx_init_pipelines(d3d12_video_t* d3d12)
if (!d3d_compile(shader, sizeof(shader), NULL, "GSMain", "gs_5_0", &gs_code)) if (!d3d_compile(shader, sizeof(shader), NULL, "GSMain", "gs_5_0", &gs_code))
goto error; goto error;
// desc.BlendState.RenderTarget[0].BlendEnable = false; desc.BlendState.RenderTarget[0].BlendEnable = false;
desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT; desc.PrimitiveTopologyType = D3D12_PRIMITIVE_TOPOLOGY_TYPE_POINT;
desc.InputLayout.pInputElementDescs = inputElementDesc; desc.InputLayout.pInputElementDescs = inputElementDesc;
desc.InputLayout.NumElements = countof(inputElementDesc); desc.InputLayout.NumElements = countof(inputElementDesc);
if (!d3d12_init_pipeline( if (!d3d12_init_pipeline(
d3d12->device, vs_code, ps_code, gs_code, &desc, &d3d12->sprites.pipe)) d3d12->device, vs_code, ps_code, gs_code, &desc, &d3d12->sprites.pipe_noblend))
goto error;
desc.BlendState.RenderTarget[0].BlendEnable = true;
if (!d3d12_init_pipeline(
d3d12->device, vs_code, ps_code, gs_code, &desc, &d3d12->sprites.pipe_blend))
goto error; goto error;
Release(ps_code); Release(ps_code);
@ -336,6 +341,7 @@ static void d3d12_gfx_free(void* data)
font_driver_free_osd(); font_driver_free_osd();
Release(d3d12->sprites.vbo); Release(d3d12->sprites.vbo);
Release(d3d12->menu_pipeline_vbo);
Release(d3d12->frame.ubo); Release(d3d12->frame.ubo);
Release(d3d12->frame.vbo); Release(d3d12->frame.vbo);
@ -360,7 +366,8 @@ static void d3d12_gfx_free(void* data)
for (i = 0; i < GFX_MAX_SHADERS; i++) for (i = 0; i < GFX_MAX_SHADERS; i++)
Release(d3d12->pipes[i]); Release(d3d12->pipes[i]);
Release(d3d12->sprites.pipe); Release(d3d12->sprites.pipe_blend);
Release(d3d12->sprites.pipe_noblend);
Release(d3d12->sprites.pipe_font); Release(d3d12->sprites.pipe_font);
Release(d3d12->queue.fence); Release(d3d12->queue.fence);
@ -602,6 +609,7 @@ static bool d3d12_gfx_frame(
D3D12RSSetViewports(d3d12->queue.cmd, 1, &d3d12->chain.viewport); D3D12RSSetViewports(d3d12->queue.cmd, 1, &d3d12->chain.viewport);
D3D12RSSetScissorRects(d3d12->queue.cmd, 1, &d3d12->chain.scissorRect); D3D12RSSetScissorRects(d3d12->queue.cmd, 1, &d3d12->chain.scissorRect);
d3d12->sprites.pipe = d3d12->sprites.pipe_noblend;
D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe); D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe);
D3D12IASetPrimitiveTopology(d3d12->queue.cmd, D3D_PRIMITIVE_TOPOLOGY_POINTLIST); D3D12IASetPrimitiveTopology(d3d12->queue.cmd, D3D_PRIMITIVE_TOPOLOGY_POINTLIST);
D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view); D3D12IASetVertexBuffers(d3d12->queue.cmd, 0, 1, &d3d12->sprites.vbo_view);
@ -808,12 +816,12 @@ static uintptr_t d3d12_gfx_load_texture(
case TEXTURE_FILTER_MIPMAP_LINEAR: case TEXTURE_FILTER_MIPMAP_LINEAR:
/* fallthrough */ /* fallthrough */
case TEXTURE_FILTER_LINEAR: case TEXTURE_FILTER_LINEAR:
texture->sampler = d3d12->samplers[RARCH_FILTER_LINEAR][RARCH_WRAP_DEFAULT]; texture->sampler = d3d12->samplers[RARCH_FILTER_LINEAR][RARCH_WRAP_EDGE];
break; break;
case TEXTURE_FILTER_MIPMAP_NEAREST: case TEXTURE_FILTER_MIPMAP_NEAREST:
/* fallthrough */ /* fallthrough */
case TEXTURE_FILTER_NEAREST: case TEXTURE_FILTER_NEAREST:
texture->sampler = d3d12->samplers[RARCH_FILTER_NEAREST][RARCH_WRAP_DEFAULT]; texture->sampler = d3d12->samplers[RARCH_FILTER_NEAREST][RARCH_WRAP_EDGE];
break; break;
} }

84
menu/drivers_display/menu_display_d3d11.c
View File

@ -50,6 +50,7 @@ static void menu_display_d3d11_viewport(void* data) {}
static void menu_display_d3d11_draw(void* data) static void menu_display_d3d11_draw(void* data)
{ {
int vertex_count;
d3d11_video_t* d3d11 = (d3d11_video_t*)video_driver_get_ptr(false); d3d11_video_t* d3d11 = (d3d11_video_t*)video_driver_get_ptr(false);
menu_display_ctx_draw_t* draw = (menu_display_ctx_draw_t*)data; menu_display_ctx_draw_t* draw = (menu_display_ctx_draw_t*)data;
@ -74,57 +75,98 @@ static void menu_display_d3d11_draw(void* data)
return; return;
} }
if (!d3d11->sprites.enabled) if (draw->coords->vertex && draw->coords->tex_coord && draw->coords->color)
vertex_count = draw->coords->vertices;
else
vertex_count = 1;
if (!d3d11->sprites.enabled || vertex_count > d3d11->sprites.capacity)
return; return;
if (d3d11->sprites.offset + 1 > d3d11->sprites.capacity) if (d3d11->sprites.offset + vertex_count > d3d11->sprites.capacity)
d3d11->sprites.offset = 0; d3d11->sprites.offset = 0;
{ {
D3D11_MAPPED_SUBRESOURCE mapped_vbo; D3D11_MAPPED_SUBRESOURCE mapped_vbo;
d3d11_sprite_t* v = NULL; d3d11_sprite_t* sprite = NULL;
D3D11MapBuffer( D3D11MapBuffer(
d3d11->context, d3d11->sprites.vbo, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mapped_vbo); d3d11->context, d3d11->sprites.vbo, 0, D3D11_MAP_WRITE_NO_OVERWRITE, 0, &mapped_vbo);
v = (d3d11_sprite_t*)mapped_vbo.pData + d3d11->sprites.offset; sprite = (d3d11_sprite_t*)mapped_vbo.pData + d3d11->sprites.offset;
v->pos.x = draw->x / (float)d3d11->viewport.Width; if (vertex_count == 1)
v->pos.y = (d3d11->viewport.Height - draw->y - draw->height) / (float)d3d11->viewport.Height; {
v->pos.w = draw->width / (float)d3d11->viewport.Width; sprite->pos.x = draw->x / (float)d3d11->viewport.Width;
v->pos.h = draw->height / (float)d3d11->viewport.Height; sprite->pos.y =
(d3d11->viewport.Height - draw->y - draw->height) / (float)d3d11->viewport.Height;
sprite->pos.w = draw->width / (float)d3d11->viewport.Width;
sprite->pos.h = draw->height / (float)d3d11->viewport.Height;
v->coords.u = 0.0f; sprite->coords.u = 0.0f;
v->coords.v = 0.0f; sprite->coords.v = 0.0f;
v->coords.w = 1.0f; sprite->coords.w = 1.0f;
v->coords.h = 1.0f; sprite->coords.h = 1.0f;
if (draw->scale_factor) if (draw->scale_factor)
v->params.scaling = draw->scale_factor; sprite->params.scaling = draw->scale_factor;
else else
v->params.scaling = 1.0f; sprite->params.scaling = 1.0f;
v->params.rotation = draw->rotation; sprite->params.rotation = draw->rotation;
v->colors[3] = DXGI_COLOR_RGBA( sprite->colors[3] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[0], 0xFF * draw->coords->color[1], 0xFF * draw->coords->color[0], 0xFF * draw->coords->color[1],
0xFF * draw->coords->color[2], 0xFF * draw->coords->color[3]); 0xFF * draw->coords->color[2], 0xFF * draw->coords->color[3]);
v->colors[2] = DXGI_COLOR_RGBA( sprite->colors[2] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[4], 0xFF * draw->coords->color[5], 0xFF * draw->coords->color[4], 0xFF * draw->coords->color[5],
0xFF * draw->coords->color[6], 0xFF * draw->coords->color[7]); 0xFF * draw->coords->color[6], 0xFF * draw->coords->color[7]);
v->colors[1] = DXGI_COLOR_RGBA( sprite->colors[1] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[8], 0xFF * draw->coords->color[9], 0xFF * draw->coords->color[8], 0xFF * draw->coords->color[9],
0xFF * draw->coords->color[10], 0xFF * draw->coords->color[11]); 0xFF * draw->coords->color[10], 0xFF * draw->coords->color[11]);
v->colors[0] = DXGI_COLOR_RGBA( sprite->colors[0] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[12], 0xFF * draw->coords->color[13], 0xFF * draw->coords->color[12], 0xFF * draw->coords->color[13],
0xFF * draw->coords->color[14], 0xFF * draw->coords->color[15]); 0xFF * draw->coords->color[14], 0xFF * draw->coords->color[15]);
}
else
{
int i;
const float* vertex = draw->coords->vertex;
const float* tex_coord = draw->coords->tex_coord;
const float* color = draw->coords->color;
for (i = 0; i < vertex_count; i++)
{
d3d11_vertex_t* v = (d3d11_vertex_t*)sprite;
v->position[0] = *vertex++;
v->position[1] = *vertex++;
v->texcoord[0] = *tex_coord++;
v->texcoord[1] = *tex_coord++;
v->color[0] = *color++;
v->color[1] = *color++;
v->color[2] = *color++;
v->color[3] = *color++;
sprite++;
}
d3d11_set_shader(d3d11->context, &d3d11->shaders[VIDEO_SHADER_STOCK_BLEND]);
D3D11SetPrimitiveTopology(d3d11->context, D3D11_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
}
D3D11UnmapBuffer(d3d11->context, d3d11->sprites.vbo, 0); D3D11UnmapBuffer(d3d11->context, d3d11->sprites.vbo, 0);
} }
d3d11_set_texture_and_sampler(d3d11->context, 0, (d3d11_texture_t*)draw->texture); d3d11_set_texture_and_sampler(d3d11->context, 0, (d3d11_texture_t*)draw->texture);
D3D11Draw(d3d11->context, 1, d3d11->sprites.offset); D3D11Draw(d3d11->context, vertex_count, d3d11->sprites.offset);
d3d11->sprites.offset++; d3d11->sprites.offset += vertex_count;
if (vertex_count > 1)
{
d3d11_set_shader(d3d11->context, &d3d11->sprites.shader);
D3D11SetPrimitiveTopology(d3d11->context, D3D11_PRIMITIVE_TOPOLOGY_POINTLIST);
}
return; return;
} }

99
menu/drivers_display/menu_display_d3d12.c
View File

@ -38,7 +38,7 @@ static void menu_display_d3d12_blend_begin(void)
{ {
d3d12_video_t* d3d12 = (d3d12_video_t*)video_driver_get_ptr(false); d3d12_video_t* d3d12 = (d3d12_video_t*)video_driver_get_ptr(false);
/*todo: d3d12->sprites.pipe_blend */ d3d12->sprites.pipe = d3d12->sprites.pipe_blend;
D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe); D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe);
} }
@ -46,7 +46,7 @@ static void menu_display_d3d12_blend_end(void)
{ {
d3d12_video_t* d3d12 = (d3d12_video_t*)video_driver_get_ptr(false); d3d12_video_t* d3d12 = (d3d12_video_t*)video_driver_get_ptr(false);
/*todo: d3d12->sprites.pipe_noblend */ d3d12->sprites.pipe = d3d12->sprites.pipe_noblend;
D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe); D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe);
} }
@ -54,6 +54,7 @@ static void menu_display_d3d12_viewport(void* data) {}
static void menu_display_d3d12_draw(void* data) static void menu_display_d3d12_draw(void* data)
{ {
int vertex_count;
d3d12_video_t* d3d12 = (d3d12_video_t*)video_driver_get_ptr(false); d3d12_video_t* d3d12 = (d3d12_video_t*)video_driver_get_ptr(false);
menu_display_ctx_draw_t* draw = (menu_display_ctx_draw_t*)data; menu_display_ctx_draw_t* draw = (menu_display_ctx_draw_t*)data;
@ -76,51 +77,84 @@ static void menu_display_d3d12_draw(void* data)
return; return;
} }
if (!d3d12->sprites.enabled) if (draw->coords->vertex && draw->coords->tex_coord && draw->coords->color)
vertex_count = draw->coords->vertices;
else
vertex_count = 1;
if (!d3d12->sprites.enabled || vertex_count > d3d12->sprites.capacity)
return; return;
if (d3d12->sprites.offset + 1 > d3d12->sprites.capacity) if (d3d12->sprites.offset + vertex_count > d3d12->sprites.capacity)
d3d12->sprites.offset = 0; d3d12->sprites.offset = 0;
{ {
d3d12_sprite_t* v; d3d12_sprite_t* sprite;
D3D12_RANGE range = { 0, 0 }; D3D12_RANGE range = { 0, 0 };
D3D12Map(d3d12->sprites.vbo, 0, &range, (void**)&v); D3D12Map(d3d12->sprites.vbo, 0, &range, (void**)&sprite);
v += d3d12->sprites.offset; sprite += d3d12->sprites.offset;
v->pos.x = draw->x / (float)d3d12->chain.viewport.Width; if (vertex_count == 1)
v->pos.y = (d3d12->chain.viewport.Height - draw->y - draw->height) / {
sprite->pos.x = draw->x / (float)d3d12->chain.viewport.Width;
sprite->pos.y = (d3d12->chain.viewport.Height - draw->y - draw->height) /
(float)d3d12->chain.viewport.Height; (float)d3d12->chain.viewport.Height;
v->pos.w = draw->width / (float)d3d12->chain.viewport.Width; sprite->pos.w = draw->width / (float)d3d12->chain.viewport.Width;
v->pos.h = draw->height / (float)d3d12->chain.viewport.Height; sprite->pos.h = draw->height / (float)d3d12->chain.viewport.Height;
v->coords.u = 0.0f; sprite->coords.u = 0.0f;
v->coords.v = 0.0f; sprite->coords.v = 0.0f;
v->coords.w = 1.0f; sprite->coords.w = 1.0f;
v->coords.h = 1.0f; sprite->coords.h = 1.0f;
if (draw->scale_factor) if (draw->scale_factor)
v->params.scaling = draw->scale_factor; sprite->params.scaling = draw->scale_factor;
else else
v->params.scaling = 1.0f; sprite->params.scaling = 1.0f;
v->params.rotation = draw->rotation; sprite->params.rotation = draw->rotation;
v->colors[3] = DXGI_COLOR_RGBA( sprite->colors[3] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[0], 0xFF * draw->coords->color[1], 0xFF * draw->coords->color[0], 0xFF * draw->coords->color[1],
0xFF * draw->coords->color[2], 0xFF * draw->coords->color[3]); 0xFF * draw->coords->color[2], 0xFF * draw->coords->color[3]);
v->colors[2] = DXGI_COLOR_RGBA( sprite->colors[2] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[4], 0xFF * draw->coords->color[5], 0xFF * draw->coords->color[4], 0xFF * draw->coords->color[5],
0xFF * draw->coords->color[6], 0xFF * draw->coords->color[7]); 0xFF * draw->coords->color[6], 0xFF * draw->coords->color[7]);
v->colors[1] = DXGI_COLOR_RGBA( sprite->colors[1] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[8], 0xFF * draw->coords->color[9], 0xFF * draw->coords->color[8], 0xFF * draw->coords->color[9],
0xFF * draw->coords->color[10], 0xFF * draw->coords->color[12]); 0xFF * draw->coords->color[10], 0xFF * draw->coords->color[11]);
v->colors[0] = DXGI_COLOR_RGBA( sprite->colors[0] = DXGI_COLOR_RGBA(
0xFF * draw->coords->color[12], 0xFF * draw->coords->color[13], 0xFF * draw->coords->color[12], 0xFF * draw->coords->color[13],
0xFF * draw->coords->color[14], 0xFF * draw->coords->color[15]); 0xFF * draw->coords->color[14], 0xFF * draw->coords->color[15]);
}
else
{
int i;
const float* vertex = draw->coords->vertex;
const float* tex_coord = draw->coords->tex_coord;
const float* color = draw->coords->color;
range.Begin = d3d12->sprites.offset * sizeof(*v); for (i = 0; i < vertex_count; i++)
range.End = (d3d12->sprites.offset + 1) * sizeof(*v); {
d3d12_vertex_t* v = (d3d12_vertex_t*)sprite;
v->position[0] = *vertex++;
v->position[1] = *vertex++;
v->texcoord[0] = *tex_coord++;
v->texcoord[1] = *tex_coord++;
v->color[0] = *color++;
v->color[1] = *color++;
v->color[2] = *color++;
v->color[3] = *color++;
sprite++;
}
D3D12SetPipelineState(d3d12->queue.cmd, d3d12->pipes[VIDEO_SHADER_STOCK_BLEND]);
D3D12IASetPrimitiveTopology(d3d12->queue.cmd, D3D_PRIMITIVE_TOPOLOGY_TRIANGLESTRIP);
}
range.Begin = d3d12->sprites.offset * sizeof(*sprite);
range.End = (d3d12->sprites.offset + vertex_count) * sizeof(*sprite);
D3D12Unmap(d3d12->sprites.vbo, 0, &range); D3D12Unmap(d3d12->sprites.vbo, 0, &range);
} }
@ -129,10 +163,21 @@ static void menu_display_d3d12_draw(void* data)
if (texture->dirty) if (texture->dirty)
d3d12_upload_texture(d3d12->queue.cmd, texture); d3d12_upload_texture(d3d12->queue.cmd, texture);
d3d12_set_texture_and_sampler(d3d12->queue.cmd, texture); d3d12_set_texture_and_sampler(d3d12->queue.cmd, texture);
D3D12SetGraphicsRootDescriptorTable(
d3d12->queue.cmd, ROOT_ID_SAMPLER_T,
d3d12->samplers[RARCH_FILTER_NEAREST][RARCH_WRAP_BORDER]);
}
D3D12DrawInstanced(d3d12->queue.cmd, vertex_count, 1, d3d12->sprites.offset, 0);
d3d12->sprites.offset += vertex_count;
if (vertex_count > 1)
{
D3D12SetPipelineState(d3d12->queue.cmd, d3d12->sprites.pipe);
D3D12IASetPrimitiveTopology(d3d12->queue.cmd, D3D_PRIMITIVE_TOPOLOGY_POINTLIST);
} }
D3D12DrawInstanced(d3d12->queue.cmd, 1, 1, d3d12->sprites.offset, 0);
d3d12->sprites.offset++;
return; return;
} }