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.

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

rsx: Minor fixes #10463

Merged
merged 2 commits into from Jun 16, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 0 additions & 2 deletions rpcs3/Emu/RSX/Common/surface_store.h
Expand Up @@ -327,8 +327,6 @@ namespace rsx
for (const auto& e : list2) surface_info.push_back(e);
}

// TODO: Modify deferred_clip_region::direct_copy() to take a few more things into account!
const auto pitch = new_surface->get_rsx_pitch();
for (const auto &e: surface_info)
{
auto this_address = e.first;
Expand Down
8 changes: 8 additions & 0 deletions rpcs3/Emu/RSX/VK/VKAsyncScheduler.cpp
Expand Up @@ -12,6 +12,14 @@ namespace vk
{
void AsyncTaskScheduler::operator()()
{
if (g_cfg.video.renderer != video_renderer::vulkan || !g_cfg.video.vk.asynchronous_texture_streaming)
{
// Invalid renderer combination, do not proceed. This should never happen.
// NOTE: If managed by fxo, this object may be created automatically on boot.
rsx_log.notice("Vulkan async streaming is disabled. This thread will now exit.");
return;
}

init_config_options();
if (!m_use_host_scheduler)
{
Expand Down
4 changes: 2 additions & 2 deletions rpcs3/Emu/RSX/VK/VKAsyncScheduler.h
Expand Up @@ -73,7 +73,7 @@ namespace vk
void insert_sync_event();

public:
AsyncTaskScheduler() = default;
AsyncTaskScheduler(const std::string_view& name) : thread_name(name) {} // This ctor stops default initialization by fxo
~AsyncTaskScheduler();

command_buffer* get_current();
Expand All @@ -86,7 +86,7 @@ namespace vk
// Thread entry-point
void operator()();

static constexpr auto thread_name = "Vulkan Async Scheduler"sv;
const std::string_view thread_name;
};

using async_scheduler_thread = named_thread<AsyncTaskScheduler>;
Expand Down
2 changes: 1 addition & 1 deletion rpcs3/Emu/RSX/VK/VKGSRender.cpp
Expand Up @@ -592,7 +592,7 @@ VKGSRender::VKGSRender() : GSRender()
if (backend_config.supports_asynchronous_compute)
{
// Run only if async compute can be used.
g_fxo->init<vk::async_scheduler_thread>();
g_fxo->init<vk::async_scheduler_thread>("Vulkan Async Scheduler"sv);
}
}
}
Expand Down