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

Fix fxo dependencies #14897

Merged
merged 3 commits into from
Dec 15, 2023
Merged

Fix fxo dependencies #14897

merged 3 commits into from
Dec 15, 2023

Conversation

Megamouse
Copy link
Contributor

Fixes some dependency issues revealed by #14896

@Megamouse Megamouse force-pushed the fxo_fixes branch 2 times, most recently from 18fde3f to b3cbed9 Compare December 14, 2023 20:03
rpcs3/Emu/System.cpp Outdated Show resolved Hide resolved
@@ -2412,20 +2413,20 @@ void VKGSRender::close_and_submit_command_buffer(vk::fence* pFence, VkSemaphore
primary_submit_info.wait_on(wait_semaphore, pipeline_stage_flags);
}

auto& async_scheduler = g_fxo->get<vk::AsyncTaskScheduler>();
if (async_scheduler.is_recording())
if (auto async_scheduler = g_fxo->try_get<vk::AsyncTaskScheduler>();
Copy link
Contributor

@kd-11 kd-11 Dec 14, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Pretty sure the task scheduler should always exist, at least with the current code model. I'll have to check this properly when I have the time, otherwise it can cause nasty GPU hangs and/or BSODs.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No. it depends on the async compute capability

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which I don't have for some reason

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah. it needs async texture streaming. Otherwise the object is not created.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Only if supports_asynchronous_compute property is true it is created, I believe this is mergeable because its needed for more changes.

@Megamouse Megamouse force-pushed the fxo_fixes branch 3 times, most recently from 677a93c to 6e8bcef Compare December 14, 2023 21:41
@Megamouse Megamouse merged commit f8e0c9e into RPCS3:master Dec 15, 2023
6 checks passed
@Megamouse Megamouse deleted the fxo_fixes branch December 16, 2023 09:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants