-
Notifications
You must be signed in to change notification settings - Fork 113
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
Rearrange Direct3D namespaces: #579
Conversation
Looks good so far. It will need to update the .winmd too. |
@damyanp this PR is marked as a Draft so we haven't looked too closely or integrated it yet. Are you planning to make more changes? |
Thanks for the prod - I don't have any more changes planned. I'll try and make some time to resolve the conflicts so we can take it out of draft. |
Thanks. A few other headers we needed recommendations for were d3dcaps.h, d3dnthal.h, d3dtypes.h, and ddrawgdi.h. |
@mikebattista - I'm trying to get this back into shape. Should I be concerned about the following warning? I don't quite get the significance of it:
|
d3dcommon.h -> Windows.Win32.Graphics.Direct3D. dxcompiler.h -> Windows.Win32.Graphics.Direct3D.Fxc dxcapi.h is -> Windows.Win32.Graphics.Direct3D.Dxc d3d11on12.h -> Windows.Win32.Graphics.Direct3D11on12 dxcore*.h -> Windows.Win32.Graphics.DXCore # Conflicts: # generation/WinSDK/Partitions/Direct3DDxgi/main.cpp # generation/WinSDK/Partitions/Direct3DHlsl/main.cpp # generation/WinSDK/Partitions/Gdi/DXCore/main.cpp # generation/WinSDK/Partitions/Gdi/DXCore/settings.rsp # generation/WinSDK/Partitions/Gdi/Direct3D/main.cpp # generation/WinSDK/Partitions/Gdi/Direct3D/settings.rsp # generation/WinSDK/Partitions/Gdi/Direct3D11on12/main.cpp # generation/WinSDK/Partitions/Gdi/Direct3D11on12/settings.rsp # generation/WinSDK/Partitions/Gdi/Direct3DDxc/main.cpp # generation/WinSDK/Partitions/Gdi/Direct3DDxc/settings.rsp # generation/WinSDK/Partitions/Gdi/Direct3DFxc/main.cpp # generation/WinSDK/Partitions/Gdi/Direct3DFxc/settings.rsp # generation/scraper/Partitions/Direct3D12/settings.rsp # generation/scraper/Partitions/Direct3DHlsl/main.cpp
@sotteson1 do you know about this warning? |
You can add those to this property in Windows.Win32.proj: ExcludeFromCrossarch |
63f92a0
to
6548112
Compare
# Conflicts: # generation/WinSDK/Windows.Win32.proj
@mikebattista - I'll try and resolve the merge conflicts again soon, but this PR is ready for review. I want to use another PR to take in our proposed changes for the other headers you mentioned in #579 (comment). |
Thanks. Don't worry about merge conflicts. We'll address that as part of the merge. |
While merging the ExcludeFromCrossArch changes, I found yours differed by: Ado Are these all intentional changes? @sotteson1 as well for review. Hard to tell what's expected with the two long lists that both changed. |
The various DX ones are. The others I'm not sure about - when I did the merge a couple of weeks ago those ones I think were in main, but maybe that's changed again.
|
Thanks. Steve did a big refactor recently so not sure if the unexpected ones in your list were removed with his changes. @sotteson1 can you take a look? Can we safely just add the D* items in the list to what's in the master branch and ignore the others? |
The build will tell you at the end which partitions can be added to the list. If it lists any, you can add them to the property. If it doesn't list any, you're good. To get the current list, I commented out the property and let the build tell me what it should be (takes a lot longer because every partition has to get scanned 3 times). |
d3dcommon.h -> Windows.Win32.Graphics.Direct3D.
dxcompiler.h -> Windows.Win32.Graphics.Direct3D.Fxc
dxcapi.h is -> Windows.Win32.Graphics.Direct3D.Dxc
d3d11on12.h -> Windows.Win32.Graphics.Direct3D11on12
dxcore*.h -> Windows.Win32.Graphics.DXCore