Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk: Do not access async scheduler if not explicitly initialized

Browse Source
This commit is contained in:
kd-11
2025-10-18 03:29:49 +03:00
committed by kd-11
parent c4fba680d1
commit 0c4e7fc178
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/VK/VKDraw.cpp
+6 -5
View File
@@ -505,16 +505,17 @@ void VKGSRender::load_texture_env()
} }
} }
if (g_cfg.video.vk.asynchronous_texture_streaming) if (backend_config.supports_asynchronous_compute)
{ {
// We have to do this here, because we have to assume the CB will be dumped // We have to do this here, because we have to assume the CB will be dumped
auto& async_task_scheduler = g_fxo->get<vk::AsyncTaskScheduler>(); auto async_task_scheduler = g_fxo->try_get<vk::AsyncTaskScheduler>();
if (async_task_scheduler.is_recording() && if (async_task_scheduler &&
!async_task_scheduler.is_host_mode()) async_task_scheduler->is_recording() &&
!async_task_scheduler->is_host_mode())
{ {
// Sync any async scheduler tasks // Sync any async scheduler tasks
if (auto ev = async_task_scheduler.get_primary_sync_label()) if (auto ev = async_task_scheduler->get_primary_sync_label())
{ {
ev->gpu_wait(*m_current_command_buffer, m_async_compute_dependency_info); ev->gpu_wait(*m_current_command_buffer, m_async_compute_dependency_info);
} }
rpcs3/Emu/RSX/VK/VKTexture.cpp
+1 -1
View File
@@ -867,7 +867,7 @@ namespace vk
static const vk::command_buffer& prepare_for_transfer(const vk::command_buffer& primary_cb, vk::image* dst_image, rsx::flags32_t& flags) static const vk::command_buffer& prepare_for_transfer(const vk::command_buffer& primary_cb, vk::image* dst_image, rsx::flags32_t& flags)
{ {
AsyncTaskScheduler* async_scheduler = (flags & image_upload_options::upload_contents_async) AsyncTaskScheduler* async_scheduler = (flags & image_upload_options::upload_contents_async)
? std::addressof(g_fxo->get<AsyncTaskScheduler>()) ? g_fxo->try_get<AsyncTaskScheduler>()
: nullptr; : nullptr;
if (async_scheduler && (dst_image->aspect() & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT))) if (async_scheduler && (dst_image->aspect() & (VK_IMAGE_ASPECT_DEPTH_BIT | VK_IMAGE_ASPECT_STENCIL_BIT)))
rpcs3/Emu/RSX/VK/VKTextureCache.cpp
+1 -1
View File
@@ -1115,7 +1115,7 @@ namespace vk
const bool upload_async = rsx::get_current_renderer()->get_backend_config().supports_asynchronous_compute; const bool upload_async = rsx::get_current_renderer()->get_backend_config().supports_asynchronous_compute;
rsx::flags32_t create_flags = 0; rsx::flags32_t create_flags = 0;
if (upload_async && g_fxo->get<AsyncTaskScheduler>().is_host_mode()) if (upload_async && ensure(g_fxo->try_get<AsyncTaskScheduler>())->is_host_mode())
{ {
create_flags |= texture_create_flags::do_not_reuse; create_flags |= texture_create_flags::do_not_reuse;
if (m_device->get_graphics_queue() != m_device->get_transfer_queue()) if (m_device->get_graphics_queue() != m_device->get_transfer_queue())