-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Shaderc: Make non-semantic debug optional #11861
base: master
Are you sure you want to change the base?
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Was able to build a non patched pcsx2 on my end.
b2b5974
to
003e176
Compare
|
003e176
to
7568f5e
Compare
Don't you hate it when you come up with more ideas just minutes AFTER the PR has been merged?
7568f5e
to
c8ce455
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
So, you've removed like 90% of the patch. The idea was to support the existing patch and an unpatched shaderc. Ideally you'd only change one line in the patch, the addition of #define SHADERC_PCSX2_CUSTOM 1
.
You've removed shaderc_compilation_status_to_string and bunch of the shaderc_compile_into_xyz functions. If we're going this route a patched shaderc should be dropped outright. But that's not what I wanted to do.
What's the point of the part of the patch they removed? From my perspective, all it seems to do is mess with the signatures of a bunch of methods to return a status code separately from the rest of the results, but that status code can be fetched from the I guess you can now get an error code even if shaderc fails to even allocate a result struct, but that feels fairly unlikely and we'll still print a (fairly unique) "null result object" for that. |
I trust your judgement on the issue. I was not expecting the original patch to be completely modified. In all honesty I can't confidently review the shaderc changes beyond if it compiles or not, hence my original expectation of it being relatively unchanged. |
I re-added the result error code stringification, PCSX2-side this time, so it'll work regardless of what shaderc you use |
16374be
to
0ae2e8b
Compare
0ae2e8b
to
2cac643
Compare
Description of Changes
This PR drops the hard requirement and the dependencies on the patched shaderc (so you can build PCSX2 without the patch if you choose to do so), whilst still reserving the patch for those who needs/wants it (non-semantic debug changes).
Rationale behind Changes
This should go along nicely with the package mode.
Suggested Testing Steps
See if the CI passes and nothing else broke.