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

Update directx headers to facilitate future updates #6856

Open
wants to merge 17 commits into
base: main
Choose a base branch
from

Conversation

Nielsbishere
Copy link
Contributor

@Nielsbishere Nielsbishere commented Aug 9, 2024

Fixed some things on unix to allow further updates from DirectX-Headers.

Important fixes to ensure #6827 this will be able to build, it's a lot cleaner than the fixes there and I will be porting them over later. The major changes;

  • dxc/WinAdapter.h now extends DirectX-Headers/WSL's winAdapter.h, to avoid conflicts and allow the latest DirectX-Headers to be used rather than a 2 year outdated one.
  • Unified lots of types; all fixed int types now align properly between windows and unix (more importantly; between the two winadapters).
  • Removed duplicate defines and type definitions.
  • Fixed CROSS_PLATFORM_UUIDOF to allow support for the two varying __uuidof implementations
  • Fixed type incompatiblity of a LPBOOL which was seen as a bool* even though it's a BOOL*, where a BOOL is an int, but a bool would just be a 1-byte type.
  • Windows now also includes DirectX-Headers to ensure it doesn't use a stale DX12 header

Important note; needs the corresponding DirectX-Headers update that prepared a little bit for it (microsoft/DirectX-Headers#137). After that merge, please change the submodule from Oxsomi/DirectX-Headers back to Microsoft/DirectX-Headers.

…void conflicts and allow the latest DirectX-Headers to be used rather than a 2 year outdated one. Unified lots of types; all fixed int types now align properly between windows and unix (more importantly; between the two winadapters). Removed duplicate defines and type definitions. Replaced CROSS_PLATFORM_UUIDOF with __CRT_UUID_DECL so that it can use the uuid macro from wsl. Fixed type incompatiblity of a LPBOOL which really refered to a bool* (BOOL is 32-bit according to WSL).
…nition that DirectX-Headers uses to define GUIDs so that either implementation of __uuidof can find the GUID.
@Nielsbishere Nielsbishere requested a review from a team as a code owner August 9, 2024 20:34
Copy link
Contributor

github-actions bot commented Aug 9, 2024

✅ With the latest revision this PR passed the C/C++ code formatter.

@Nielsbishere Nielsbishere changed the title Update directx headers to facilitate future updates WIP: Update directx headers to facilitate future updates Aug 9, 2024
@Nielsbishere Nielsbishere changed the title WIP: Update directx headers to facilitate future updates Update directx headers to facilitate future updates Aug 9, 2024
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.

1 participant