-
Notifications
You must be signed in to change notification settings - Fork 84
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
chore: Switch out winapi to windows-rs #298
base: main
Are you sure you want to change the base?
Conversation
37e446d
to
e286414
Compare
@dklassic It looks like there are still some build failures here depending on the features passed. |
oops seems like I missed migrating winapi used in I'm out for a small trip I'll continue to cleanup the rest once I'm back. |
… into switch-out-winapi
"winerror", | ||
"wingdi", | ||
"winuser", | ||
windows = { version = "0.58", features = [ |
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.
Could we use windows-sys?
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.
From what I can tell, windows-sys does not have the feature set for manipulating DXGI so at best we would be using a mixture of both windows and windows-sys
use winapi::um::d3dcommon::{D3D_DRIVER_TYPE_UNKNOWN, D3D_DRIVER_TYPE_WARP}; | ||
|
||
const INTEL_PCI_ID: UINT = 0x8086; | ||
const INTEL_PCI_ID: u32 = 0x8086; |
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.
I saw many number types use rust types directly.
Should they use types in std::ffi instead?
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.
I think it's pretty okay to use Rust types directly because windows-rs
crate takes in Rust types directly as well.
Just realized webxr repo also has to be tested :/ |
I have a WIP branch for updating webxr crate to windows/windows-sys, happy to assist with testing this if it's ready |
@msub2 Do you have a branch for it? Perhaps we can open a draft in webxr repo to test in CI. |
I can push one up soon, I'm currently using this branch of surfman on my WIP branch for webxr and just need to fix a couple more spots related to d3d11 textures |
hrmm, I've got the webxr crate building now but trying to test in servo with updated surfman is causing an immediate crash. ill put up a draft pr for now, still needs looking into though |
Specifically the crash is happening in |
Closes #292.
I'm still validating the change so I'll put it as a draft for now.