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 a large part of XTL-hell #1731

Merged
merged 22 commits into from Sep 24, 2019

Conversation

@PatrickvL
Copy link
Member

commented Sep 17, 2019

This PR fixes a large part of what we've been calling "XTL-hell", which is (was) the problem that non-Xbox symbols were included in the Xbox-only "namespace XTL".

The remaining XTL mentions are now really needed to indicate Xbox-specific symbols.

(Note, that the sound-code is left largely untouched, so there's still XTL-issues aroud that part of our code.)

This PR should not have any functional impact.

There's a slight risk that some log-renderings are impacted, since symbols now no-longer-can or now-cannot be resolved to logging intrinsics. If this turns out to be the case, it should be resolved in a followup-PR.

PatrickvL added 16 commits Sep 17, 2019
…ds from this field by g_Xbox_VertexShader_Handle (since all writes to this field used that as source)
…, wrap applicable contents of these included files in namespace XTL. Removed all now-obsolete "XTL::" prefixes.
…logging intrinsics inside and outside namespace XTL.
…the now-obsolete duplicate of X_D3DCALLBACK).

Also nicely indent all Direct3D9 alias defines, introduced when porting from Direct3D8. Who knows, one day we might re-define them once again to port to more recent Direct3D versions?
Copy link
Member

left a comment

I'll review more later. It's a lot of changes occur in this pull request.

src/vsbc/CxbxVSBC.h Outdated Show resolved Hide resolved
src/common/xdvdfs-tools/xdvdfs.h Show resolved Hide resolved
import/OpenXDK/include/xboxkrnl/xboxkrnl.h Outdated Show resolved Hide resolved
src/core/hle/D3D8/XbD3D8Types.h Show resolved Hide resolved
@PatrickvL PatrickvL force-pushed the PatrickvL:more_cleanup branch from 947ea24 to e120be2 Sep 17, 2019
@x1nixmzeng

This comment has been minimized.

Copy link
Contributor

commented Sep 17, 2019

I'm glad this is going ahead. I had started this on branch of my own but there were far too many files!

@PatrickvL PatrickvL force-pushed the PatrickvL:more_cleanup branch from 099cb09 to 368b1d5 Sep 17, 2019
… requires more research
@PatrickvL PatrickvL force-pushed the PatrickvL:more_cleanup branch from 368b1d5 to 58f9033 Sep 17, 2019
@RadWolfie RadWolfie self-requested a review Sep 18, 2019
@RadWolfie RadWolfie dismissed their stale review Sep 18, 2019

Author has restored the changed.

@RadWolfie RadWolfie removed their request for review Sep 18, 2019
@RadWolfie

This comment has been minimized.

Copy link
Member

commented Sep 18, 2019

There's two remarks I am requesting:

  • Allow warning about GetVersion being depreciated.
  • Fix inaccurate wording of pXBEHeaderSize to dwXBEHeaderSize. Since the string format had been changed.

EDIT: After that, looks good to me. (Beside D3D9 plugin's method been changed to global handle.)

Although, I believe testing may be necessary to see if regression may occur or not. Since the D3D9 plugin had changed the method from context's xbox handle to global xbox handle.

@PatrickvL

This comment has been minimized.

Copy link
Member Author

commented Sep 18, 2019

DrawContext is an invention of us, and is merely a carrier of data that doesn't survive longer than the draw call itself. So storing a handle in there is equal to Not storing and using the source value directly, because the source value doesn't change in between.
(Because Xbox D3d calls must be done single threaded)

@RadWolfie

This comment has been minimized.

Copy link
Member

commented Sep 19, 2019

Thanks for the comment about D3D stuff. 😄

@RadWolfie RadWolfie merged commit a6c0353 into Cxbx-Reloaded:develop Sep 24, 2019
3 checks passed
3 checks passed
Cxbx-Reloaded.Cxbx-Reloaded Build #20190924.1 succeeded
Details
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@PatrickvL PatrickvL deleted the PatrickvL:more_cleanup branch Oct 11, 2019
@PatrickvL PatrickvL restored the PatrickvL:more_cleanup branch Oct 11, 2019
@PatrickvL PatrickvL deleted the PatrickvL:more_cleanup branch Oct 11, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.