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.

Sign up for GitHub

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

Jump to bottom

Upgrade to raw-window-handle v0.3 #3050

Merged
merged 1 commit into from
Oct 19, 2019
Merged

Upgrade to raw-window-handle v0.3 #3050

merged 1 commit into from
Oct 19, 2019

Conversation

antonok-edm
Copy link
Contributor

@antonok-edm antonok-edm commented Oct 17, 2019 •
edited
Loading

Reopening #3037 against master, for merge whenever ready.

Note that compiling examples currently doesn't work because winit still imports the old version of raw-window-handle; the two versions of the traits are incompatible.

PR checklist:

  • make succeeds (on *nix)
  • make reftests succeeds
  • tested examples with the following backends: vulkan
  • rustfmt run on changed code

@antonok-edm antonok-edm changed the title Raw window handle 0.3 Upgrade to raw-window-handle v0.3 Oct 17, 2019
@kvark
Copy link
Member

kvark commented Oct 18, 2019

Note that compiling examples currently doesn't work because winit still imports the old version of raw-window-handle; the two versions of the traits are incompatible.

We can't merge until it's resolved. Could winit depend on both versions of raw-window-handle and implement their traits?

@rukai
Copy link
Contributor

rukai commented Oct 18, 2019

rust-windowing/winit#1187
The next winit 0.20 alpha release should be out any day now.

Not much point in winit continuing to support the old trait imo.

@antonok-edm
Copy link
Contributor Author

We can't merge until it's resolved. Could winit depend on both versions of raw-window-handle and implement their traits?

Sorry, I should have made that clearer. I don't intend for this to be merged until the next winit release. I've already been using this branch for a personal project without winit (for the xcb support) and wanted to replace #3037 which was open against the wrong branch.

@zakarumych
Copy link

zakarumych commented Oct 18, 2019 •
edited
Loading

winit 0.20.0-alpha4 is on crates.io. And it uses raw-window-handle 0.3

@antonok-edm
Copy link
Contributor Author

Just added a commit to upgrade winit, should be all set now

@antonok-edm antonok-edm force-pushed the raw-window-handle-0.3 branch from 15b4ef8 to c98897f Compare October 18, 2019 20:44
@zakarumych
Copy link

zakarumych commented Oct 18, 2019 •
edited
Loading

How broken line is even affected by this change?
And could adding let () = before msg_send![view, setLayer: layer]; fix it?

@zakarumych
Copy link

Seems to be the fix according to this

@SSheldon
Copy link

Apologies for the breakage! Unfortunately it's pointing out places that will invoke undefined behavior in future versions of rust. If any help is needed, I can send a PR later today.

@antonok-edm antonok-edm force-pushed the raw-window-handle-0.3 branch from d533571 to 24d52ef Compare October 18, 2019 23:56
@antonok-edm
Copy link
Contributor Author

Looks like () = was a success.

@SSheldon SSheldon mentioned this pull request Oct 19, 2019
Closed
@kvark
Copy link
Member

kvark commented Oct 19, 2019

Would you mind squashing the commits together?

@antonok-edm
upgrade to raw-window-handle v0.3.0
e7b421f 
support raw XCB handles

bump winit to 0.20.0-alpha4

fix objc macro return type inference failure
@antonok-edm antonok-edm force-pushed the raw-window-handle-0.3 branch from 24d52ef to e7b421f Compare October 19, 2019 02:24
@antonok-edm
Copy link
Contributor Author

@kvark done

@kvark
Copy link
Member

kvark commented Oct 19, 2019

Thank you!
bors r+

bors bot added a commit that referenced this pull request Oct 19, 2019
@bors @antonok-edm
Merge #3050
e89f4b6 
3050: Upgrade to raw-window-handle v0.3 r=kvark a=antonok-edm

Reopening #3037 against `master`, for merge whenever ready.

Note that compiling examples currently doesn't work because `winit` still imports the old version of `raw-window-handle`; the two versions of the traits are incompatible.

PR checklist:
- [x] `make` succeeds (on *nix)
- [x] `make reftests` succeeds
- [x] tested examples with the following backends: `vulkan`
- [x] `rustfmt` run on changed code


Co-authored-by: Anton Lazarev <[email protected]>
@bors
Copy link
Contributor

bors bot commented Oct 19, 2019

Build succeeded

@bors bors bot merged commit e7b421f into gfx-rs:master Oct 19, 2019
@bonsairobo bonsairobo mentioned this pull request Oct 21, 2019
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@antonok-edm @kvark @rukai @zakarumych @SSheldon