Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Hotfixos #5400

Merged
merged 2 commits into from
Dec 5, 2018
Merged

Hotfixos #5400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
476090a
Detach VBlank and RSX Decompiler threads
Nekotekina Dec 2, 2018
92be67b
Fix #5370 regression
Nekotekina Dec 4, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions rpcs3/Emu/RSX/RSXThread.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,7 +569,7 @@ namespace rsx

last_flip_time = get_system_time() - 1000000;

named_thread vblank_thread("VBlank Thread", [this]()
thread_ctrl::spawn("VBlank Thread", [this]()
{
const u64 start_time = get_system_time();

Expand Down Expand Up @@ -604,7 +604,7 @@ namespace rsx
}
});

named_thread decompiler_thread ("RSX Decompiler Thread", [this]
thread_ctrl::spawn("RSX Decompiler Thread", [this]
{
if (g_cfg.video.disable_asynchronous_shader_compiler)
{
Expand Down Expand Up @@ -1440,7 +1440,7 @@ namespace rsx
info.attribute_stride += rsx::get_vertex_type_size_on_host(vinfo.type(), vinfo.size());
info.locations.push_back(index);

if (input_mask & (1u << index))
if (input_mask & (1u << index))
{
result.attribute_placement[index] = attribute_buffer_placement::transient;
}
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/System.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -657,7 +657,7 @@ void Emulator::Load(bool add_only)
}
else
{
m_sfo_dir = GetSfoDirFromGamePath(fs::get_parent_dir(elf_dir), GetUsr());
m_sfo_dir = GetSfoDirFromGamePath(elf_dir + "/../", GetUsr());
}

_psf = psf::load_object(fs::file(m_sfo_dir + "/PARAM.SFO"));
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/rpcs3qt/main_window.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ void main_window::SetAppIconFromPath(const std::string& path)
{
if (!fs::is_dir(pth)) continue;

const std::string sfo_dir = Emu.GetSfoDirFromGamePath(path, Emu.GetUsr());
const std::string sfo_dir = Emu.GetSfoDirFromGamePath(pth, Emu.GetUsr());
const std::string ico = sfo_dir + "/ICON0.PNG";
if (fs::is_file(ico))
{
Expand Down