mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 09:40:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

(D3D12) Silence MSVC warnings

Browse Source
This commit is contained in:
twinaphex 2018-01-24 00:38:11 +01:00
parent 1028dc7959
commit 4dd3a22679
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gfx/common/d3d12_common.h
View File

@ -1217,7 +1217,7 @@ void d3d12_upload_texture(D3D12GraphicsCommandList cmd, d3d12_texture_t* texture
void d3d12_create_fullscreen_quad_vbo(
D3D12Device device, D3D12_VERTEX_BUFFER_VIEW* view, D3D12Resource* vbo);
static inline d3d12_resource_transition(D3D12GraphicsCommandList cmd, D3D12Resource resource,
static inline void d3d12_resource_transition(D3D12GraphicsCommandList cmd, D3D12Resource resource,
D3D12_RESOURCE_STATES state_before, D3D12_RESOURCE_STATES state_after)
{
D3D12_RESOURCE_BARRIER barrier = {
@ -1231,12 +1231,12 @@ static inline d3d12_resource_transition(D3D12GraphicsCommandList cmd, D3D12Resou
D3D12ResourceBarrier(cmd, 1, &barrier);
}
static inline d3d12_set_texture(D3D12GraphicsCommandList cmd, const d3d12_texture_t* texture)
static inline void d3d12_set_texture(D3D12GraphicsCommandList cmd, const d3d12_texture_t* texture)
{
D3D12SetGraphicsRootDescriptorTable(cmd, DESC_TABLE_INDEX_SRV_TEXTURE, texture->gpu_descriptor);
}
static inline d3d12_set_sampler(D3D12GraphicsCommandList cmd, D3D12_GPU_DESCRIPTOR_HANDLE sampler)
static inline void d3d12_set_sampler(D3D12GraphicsCommandList cmd, D3D12_GPU_DESCRIPTOR_HANDLE sampler)
{
D3D12SetGraphicsRootDescriptorTable(cmd, DESC_TABLE_INDEX_SAMPLER, sampler);
}
@ -1247,7 +1247,7 @@ static inline void d3d12_update_texture(int width, int height, int pitch, DXGI_F
uint8_t* dst;
D3D12_RANGE read_range = { 0, 0 };
D3D12Map(texture->upload_buffer, 0, &read_range, &dst);
D3D12Map(texture->upload_buffer, 0, &read_range, (void**)&dst);
dxgi_copy(width, height, format, pitch, data, texture->desc.Format,
texture->layout.Footprint.RowPitch, dst + texture->layout.Offset);

2
gfx/drivers/d3d12.c
View File

@ -348,7 +348,7 @@ static void d3d12_set_menu_texture_frame(
D3D12_RANGE read_range = { 0, 0 };
d3d12_vertex_t* v;
D3D12Map(d3d12->menu.vbo, 0, &read_range, &v);
D3D12Map(d3d12->menu.vbo, 0, &read_range, (void**)&v);
v[0].color[3] = alpha;
v[1].color[3] = alpha;
v[2].color[3] = alpha;