RPCSX/rpcsx
1
0
Fork 0
mirror of https://github.com/RPCSX/rpcsx.git synced 2026-04-20 22:05:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

[WIP] rsx: Rebase cleanup

Browse source
This commit is contained in:
kd-11 2018-11-09 17:57:07 +03:00 • committed by kd-11
parent 5193c99973
commit 833c25894f
7 changed files with 40 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

21
rpcs3/Emu/RSX/RSXThread.cpp
View file

@ -667,24 +667,6 @@ namespace rsx
void thread::on_exit()
{
m_rsx_thread_exiting = true;
if (m_vblank_thread)
{
m_vblank_thread->join();
m_vblank_thread.reset();
}
if (m_decompiler_thread)
{
m_decompiler_thread->join();
m_decompiler_thread.reset();
}
}
std::string thread::get_name() const
{
return "rsx::thread";
>>>>>>> rsx: Fixups
}
void thread::fill_scale_offset_data(void *buffer, bool flip_y) const
@ -2070,6 +2052,9 @@ namespace rsx
else
{
// Array
type = info.type();
size = info.size();
attrib0 = layout.interleaved_blocks[0].attribute_stride | default_frequency_mask;
}
}