From 87d51665dc684b7895943f1ad525476afe695587 Mon Sep 17 00:00:00 2001 From: vlj Date: Thu, 14 May 2015 17:16:48 +0200 Subject: [PATCH] d3d12: Fix some warning --- rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp | 4 ++-- rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp index 30be9c4e11..a8a1e2deba 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp @@ -94,7 +94,7 @@ std::vector getIALayout(ID3D12Device *device, bool ind { if (!vertexData[i].IsEnabled()) continue; const size_t item_size = vertexData[i].GetTypeSize() * vertexData[i].size; - offset_list[i] = item_size; + offset_list[i] = (u32)item_size; } #if DUMP_VERTEX_DATA @@ -211,7 +211,7 @@ std::vector getIALayout(ID3D12Device *device, bool ind { IAElement.SemanticName = "TEXCOORD"; IAElement.SemanticIndex = i; - IAElement.InputSlot = inputSlot; + IAElement.InputSlot = (UINT)inputSlot; IAElement.Format = getFormat(vertexData[i].type - 1, vertexData[i].size); inputSlot++; } diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp index c9eb3ece15..945154ba00 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp @@ -187,7 +187,7 @@ ID3D12PipelineState *PipelineStateObjectCache::getGraphicPipelineState( static D3D12_RASTERIZER_DESC CD3D12_RASTERIZER_DESC = { D3D12_FILL_MODE_SOLID, - D3D12_CULL_MODE_BACK, + D3D12_CULL_MODE_NONE, FALSE, D3D12_DEFAULT_DEPTH_BIAS, D3D12_DEFAULT_DEPTH_BIAS_CLAMP,