From 5a064be49019bd32a8d5556ae0b397b106dfeebf Mon Sep 17 00:00:00 2001 From: Vincent Lejeune Date: Thu, 15 Oct 2015 17:05:56 +0200 Subject: [PATCH] Fix d3d12 build. --- rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp | 3 --- rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h | 4 ++-- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp index 5794d58888..6d517b1414 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp +++ b/rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp @@ -651,9 +651,6 @@ void D3D12GSRender::flip(int buffer) if (false) { CellGcmDisplayInfo* buffers;// = vm::ps3::_ptr(m_gcm_buffers_addr); - u32 addr = rsx::get_address(buffers[gcm_current_buffer].offset, CELL_GCM_LOCATION_LOCAL); - w = buffers[gcm_current_buffer].width; - h = buffers[gcm_current_buffer].height; u32 addr = rsx::get_address(gcm_buffers[gcm_current_buffer].offset, CELL_GCM_LOCATION_LOCAL); w = gcm_buffers[gcm_current_buffer].width; h = gcm_buffers[gcm_current_buffer].height; diff --git a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h index d264b7ae28..4ddbac4d5a 100644 --- a/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h +++ b/rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h @@ -135,7 +135,7 @@ struct D3D12Traits // TODO: This shouldn't use current dir std::string filename = "./FragmentProgram" + std::to_string(ID) + ".hlsl"; - fs::file(filename, o_write | o_create | o_trunc).write(shader.c_str(), shader.size()); + fs::file(filename, fom::write | fom::create | fom::trunc).write(shader.c_str(), shader.size()); fragmentProgramData.id = (u32)ID; } @@ -148,7 +148,7 @@ struct D3D12Traits // TODO: This shouldn't use current dir std::string filename = "./VertexProgram" + std::to_string(ID) + ".hlsl"; - fs::file(filename, o_write | o_create | o_trunc).write(shaderCode.c_str(), shaderCode.size()); + fs::file(filename, fom::write | fom::create | fom::trunc).write(shaderCode.c_str(), shaderCode.size()); vertexProgramData.id = (u32)ID; }