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

Rearrange Direct3D namespaces: #579

Merged
merged 3 commits into from
Nov 5, 2021

Conversation

damyanp
Copy link
Member

@damyanp damyanp commented Jul 16, 2021

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

@sotteson1
Copy link
Contributor

Looks good so far. It will need to update the .winmd too.

@mikebattista
Copy link
Contributor

@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?

@damyanp
Copy link
Member Author

damyanp commented Sep 28, 2021

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.

@mikebattista
Copy link
Contributor

Thanks. A few other headers we needed recommendations for were d3dcaps.h, d3dnthal.h, d3dtypes.h, and ddrawgdi.h.

@damyanp
Copy link
Member Author

damyanp commented Oct 20, 2021

@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:

ClangSharpSourceToWinmd : warning CSSW001: Partitions detected with no cross-arch differences: Direct3D,Direct3D11on12,Direct3DDxc,Direct3DFxc,DXCore [D:\prj\win32metadata\generation\WinSDK\Windows.Win32.proj]

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
@mikebattista
Copy link
Contributor

@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:

ClangSharpSourceToWinmd : warning CSSW001: Partitions detected with no cross-arch differences: Direct3D,Direct3D11on12,Direct3DDxc,Direct3DFxc,DXCore [D:\prj\win32metadata\generation\WinSDK\Windows.Win32.proj]

@sotteson1 do you know about this warning?

@sotteson1
Copy link
Contributor

@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:

ClangSharpSourceToWinmd : warning CSSW001: Partitions detected with no cross-arch differences: Direct3D,Direct3D11on12,Direct3DDxc,Direct3DFxc,DXCore [D:\prj\win32metadata\generation\WinSDK\Windows.Win32.proj]

You can add those to this property in Windows.Win32.proj: ExcludeFromCrossarch

@damyanp damyanp marked this pull request as ready for review October 20, 2021 18:34
# Conflicts:
#	generation/WinSDK/Windows.Win32.proj
@damyanp
Copy link
Member Author

damyanp commented Nov 4, 2021

@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).

@mikebattista
Copy link
Contributor

Thanks. Don't worry about merge conflicts. We'll address that as part of the merge.

@mikebattista mikebattista self-assigned this Nov 4, 2021
@mikebattista
Copy link
Contributor

While merging the ExcludeFromCrossArch changes, I found yours differed by:

Ado
Audio
Automation
Cryptography
Direct3D
Direct3D11on12
Direct3DDxc
Direct3DDxgi
Direct3DFxc
DShow
DXCore

Are these all intentional changes?

@sotteson1 as well for review. Hard to tell what's expected with the two long lists that both changed.

@damyanp
Copy link
Member Author

damyanp commented Nov 4, 2021 via email

@mikebattista
Copy link
Contributor

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?

@sotteson1
Copy link
Contributor

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).

@mikebattista mikebattista merged commit af60be0 into microsoft:master Nov 5, 2021
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.

3 participants