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

Jump to bottom

changed mask type in Requirements to u32 #3301

Merged
merged 1 commit into from Jul 14, 2020
Merged

changed mask type in Requirements to u32 #3301

merged 1 commit into from Jul 14, 2020

Conversation

khodzha
Copy link
Contributor

@khodzha khodzha commented Jul 13, 2020

Fixes #3298

PR checklist:

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

kvark
kvark approved these changes Jul 13, 2020
View reviewed changes
Copy link
Member

@kvark kvark left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!
bors r+

bors bot added a commit that referenced this pull request Jul 13, 2020
@bors @khodzha
Merge #3301
acd1ea1 
3301: changed mask type in Requirements to u32 r=kvark a=khodzha

Fixes #3298 

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


Co-authored-by: Shamir Khodzha <khodzha.sh@gmail.com>
@bors
Copy link
Contributor

bors bot commented Jul 13, 2020

Canceled.

@kvark
Copy link
Member

kvark commented Jul 13, 2020

bors r+

bors bot added a commit that referenced this pull request Jul 13, 2020
@bors @khodzha
Merge #3301
667f4e5 
3301: changed mask type in Requirements to u32 r=kvark a=khodzha

Fixes #3298 

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


Co-authored-by: Shamir Khodzha <khodzha.sh@gmail.com>
@khodzha
Copy link
Contributor Author

khodzha commented Jul 13, 2020

why does windows build fail? 🤔

@bors
Copy link
Contributor

bors bot commented Jul 13, 2020

Build failed:

@kvark
Copy link
Member

kvark commented Jul 13, 2020

strage!

@kvark
Copy link
Member

kvark commented Jul 13, 2020

Travis log ate it:

error[E0308]: mismatched types
--> src\backend\dx11\src\device.rs:1103:28
|
1103 | type_mask: BUFFER_TYPE_MASK,
| ^^^^^^^^^^^^^^^^ expected u32, found u64

@khodzha
Copy link
Contributor Author

khodzha commented Jul 13, 2020

updated dx11 and dx12 backends

@kvark
Copy link
Member

kvark commented Jul 14, 2020

Thank you!
bors r+

@bors
Copy link
Contributor

bors bot commented Jul 14, 2020

Build succeeded:

@bors bors bot merged commit 69939d8 into gfx-rs:master Jul 14, 2020
@khodzha khodzha deleted the mask_32 branch July 14, 2020 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@kvark kvark kvark approved these changes

@monocodus monocodus[bot] monocodus approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Change Requirements::memort_type_bits to u32
2 participants
@khodzha @kvark