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: Fix Visual studio debug runtime #15304

Merged
merged 2 commits into from
Mar 10, 2024
Merged

Conversation

Megamouse
Copy link
Contributor

@Megamouse Megamouse commented Mar 10, 2024

  • Move entire creation of QOffscreenSurface to main thread (assert due to signal from wrong thread)
  • Fix invalid ranged_map iterator comparison (assert due to different iterator types).
    This happens if m_it is not set to an iterator of the same object as other.m_it.
iterator it1 = obj1.find(...);
iterator it2 = obj2.find(...);
iterator def1 = {};
iterator def2 = {};

 it1 == def1       // assert
 it1 == it2        // assert
def1 == def2       // fine
 it1 == obj1.end() // fine

@Megamouse Megamouse added the RSX label Mar 10, 2024
@@ -128,7 +128,14 @@ namespace rsx
public:
bool operator == (const iterator& other) const
{
return m_it == other.m_it;
// Iterators are only valid if the related data is valid
Copy link
Contributor

Choose a reason for hiding this comment

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

This really doesn't make sense. What exactly is asserting?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

For reference: you can't compare two iterators if they are not iterators of the same object.
You can only compare iterators of the same object, or e.g. two default iterators.

@Megamouse Megamouse merged commit d8d0af2 into RPCS3:master Mar 10, 2024
6 checks passed
@Megamouse Megamouse deleted the rsx_fixes branch March 10, 2024 23:26
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.

2 participants