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

Rebase of nastys/osx14 branch #15035

Closed
wants to merge 481 commits into from
Closed

Conversation

chotchki
Copy link

I need building to work on an m1 mac so I've rebased pull request #14452 for easier merging.

Megamouse and others added 30 commits January 10, 2024 20:09
- No specific optimizations yet, but they're becoming more popular so that may be necessary soon.
move some data to heap
Make it look like the rest of the file to communicate with the user correctly
- Update FAudio to 23.11
- Update SDL to 2.28.5
- Update wolfssl to 5.6.4
- Applies more aggressive DCE in the analyser. Dead-code in tails could happen before in some cases.
- We switched from a allocate-per-draw-call to reusing the vertex input data. We need to make sure previous state does not affect validation results.
- Memcpy is too slow at this level of frequency, so just reset the attributes you're using before using them.
- Also changes the validation routine to only check attributes we're actually using.
- VS states come before FS mirrors
…than low

- Hardware behavior is inconsistent so let's just emulate this when possible
RipleyTom and others added 27 commits January 10, 2024 20:18
Observed in SSX, which seems to ignore the readSize sometimes
@AniLeo AniLeo closed this Jan 11, 2024
@chotchki
Copy link
Author

@AniLeo my apologies if I've approached this wrong, pull request #14452 seemed to have stalled out on merge conflicts. On other projects I've done a git rebase to help get it over the finish line, does RPCS3 follow a different policy?

@AniLeo
Copy link
Member

AniLeo commented Jan 11, 2024

Maintainers can directly rebase open pull requests if we wanted to do so, and this isn't even a rebase, you did a git merge from master to your branch and then attempted to merge back to master over 400 commits.

The changes from that PR aren't mergeable as is regardless of rebased or not, they need to be fixed manually, hence why the draft status on the pull request

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet