archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-07 07:21:25 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix d3d12 build.

Browse source
This commit is contained in:
Vincent Lejeune 2015-10-15 17:05:56 +02:00
parent ec0005195d
commit 5a064be490
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
rpcs3/Emu/RSX/D3D12/D3D12GSRender.cpp
View file

@ -651,9 +651,6 @@ void D3D12GSRender::flip(int buffer)
if (false) if (false)
{ {
CellGcmDisplayInfo* buffers;// = vm::ps3::_ptr<CellGcmDisplayInfo>(m_gcm_buffers_addr); CellGcmDisplayInfo* buffers;// = vm::ps3::_ptr<CellGcmDisplayInfo>(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); u32 addr = rsx::get_address(gcm_buffers[gcm_current_buffer].offset, CELL_GCM_LOCATION_LOCAL);
w = gcm_buffers[gcm_current_buffer].width; w = gcm_buffers[gcm_current_buffer].width;
h = gcm_buffers[gcm_current_buffer].height; h = gcm_buffers[gcm_current_buffer].height;

4
rpcs3/Emu/RSX/D3D12/D3D12PipelineState.h
View file

@ -135,7 +135,7 @@ struct D3D12Traits
// TODO: This shouldn't use current dir // TODO: This shouldn't use current dir
std::string filename = "./FragmentProgram" + std::to_string(ID) + ".hlsl"; 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; fragmentProgramData.id = (u32)ID;
} }
@ -148,7 +148,7 @@ struct D3D12Traits
// TODO: This shouldn't use current dir // TODO: This shouldn't use current dir
std::string filename = "./VertexProgram" + std::to_string(ID) + ".hlsl"; 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; vertexProgramData.id = (u32)ID;
} }