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

d3d12: Fix some warning

This commit is contained in:
vlj 2015-05-14 17:16:48 +02:00 committed by Vincent Lejeune
parent d93e95b614
commit 87d51665dc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/RSX/D3D12/D3D12Buffer.cpp
View File

@ -94,7 +94,7 @@ std::vector<D3D12_INPUT_ELEMENT_DESC> getIALayout(ID3D12Device *device, bool ind
{ {
if (!vertexData[i].IsEnabled()) continue; if (!vertexData[i].IsEnabled()) continue;
const size_t item_size = vertexData[i].GetTypeSize() * vertexData[i].size; 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 #if DUMP_VERTEX_DATA
@ -211,7 +211,7 @@ std::vector<D3D12_INPUT_ELEMENT_DESC> getIALayout(ID3D12Device *device, bool ind
{ {
IAElement.SemanticName = "TEXCOORD"; IAElement.SemanticName = "TEXCOORD";
IAElement.SemanticIndex = i; IAElement.SemanticIndex = i;
IAElement.InputSlot = inputSlot; IAElement.InputSlot = (UINT)inputSlot;
IAElement.Format = getFormat(vertexData[i].type - 1, vertexData[i].size); IAElement.Format = getFormat(vertexData[i].type - 1, vertexData[i].size);
inputSlot++; inputSlot++;
} }

2
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.cpp
View File

@ -187,7 +187,7 @@ ID3D12PipelineState *PipelineStateObjectCache::getGraphicPipelineState(
static D3D12_RASTERIZER_DESC CD3D12_RASTERIZER_DESC = static D3D12_RASTERIZER_DESC CD3D12_RASTERIZER_DESC =
{ {
D3D12_FILL_MODE_SOLID, D3D12_FILL_MODE_SOLID,
D3D12_CULL_MODE_BACK, D3D12_CULL_MODE_NONE,
FALSE, FALSE,
D3D12_DEFAULT_DEPTH_BIAS, D3D12_DEFAULT_DEPTH_BIAS,
D3D12_DEFAULT_DEPTH_BIAS_CLAMP, D3D12_DEFAULT_DEPTH_BIAS_CLAMP,