Commit Graph
1302 Commits
Author SHA1 Message Date
Mark Swanson c757ba827b Switch XlibHandle window to c_ulong 2020-01-01 10:49:00 -05:00
bors[bot]andLayl 2a2ab3dc2a Merge #418
418: Hotfix deadlocks on resource cleanup r=kvark a=LaylConway

This resolves resource cleanup causing deadlocks with `maintain`, because of `Device::pending` being locked in reverse order.

I'm calling this a "hotfix" because I don't think this is a scaleable approach to resolve how the issue happened in the first place, but it alleviates current deadlocking isssues.

I'm not quite sure how `Token` works, so I don't know if I used that right here.

This fixes #417

Co-authored-by: Layl <2385329-layl@users.noreply.gitlab.com>
2019-12-31 06:07:35 +00:00
bors[bot]andDzmitry Malyshau 8f42ba6676 Merge #412
412: Another big tracking refactor r=later a=kvark

Fixes #409
Note: there is way more code that had to be thrown out in the process of this PR than there is in the PR itself.
Also fixes [this comment](https://github.com/gfx-rs/wgpu/blob/04e17b3f4fe44d816cebeadc0e89bf588cfefe70/wgpu-core/src/track/texture.rs#L29):
> //TODO: make this less awkward!

## Logic
Instead of having a run-time per-operation control over what state is being used for stitching (with `Stitch` enum), we are now deriving this automatically on a per-subresource level. Whenever we are detecting a transition for a sub-resource, and we know there wasn't any "first" state associated with it in the current tracker, we are saving this "first" state. Unlike previous code, where it was confusing what of `Unit` fields (`init`, `last`) are valid, now `first` is `Option<>`, so we know we should be using it if it's there.

This allows us to have this hybrid tracking state of a render pass, where all resources are immutable (and their usage is extended), except for the output attachments. This, together with a whole lot of refactoring, gets us #409.

I'm actually quite happy with the tracking code now. It's finally taking shape we aren't afraid to tell others about :)

Note: this was tested on wgpu-rs examples and vange-rs.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-30 23:11:52 +00:00
890bbcfbed Merge #416 #420 #424
416: Makefile package command and travis github releases r=kvark a=Korijn

Closes #414

Approach mostly mimicked from [gfx-portability](https://github.com/gfx-rs/portability) as recommended to me by @kvark. I needed a number of commits to iron out some kinks for the Windows builds, so I would recommend using squash merge when accepting this PR.

Note that the Windows rust=nightly build fails, but it's also broken on master, so it's unrelated to the changes in this PR.

/cc @almarklein

# Questions

- [x] Would it make sense to also regenerate the `ffi/wgpu.h` and `wgpu-remote.h` header files and include them in the zip archive?

# Todo for maintainers

- [x] Configure encrypted `api_key`
As in [gfx-portability](https://github.com/gfx-rs/portability/blob/master/.travis.yml#L61) you will need to create an API key and commit it to the `.travis.yml` file. I've checked "allow edits from maintainers" so you should be able to commit to this branch directly. You may want to reference the [Travis instructions](https://docs.travis-ci.com/user/deployment/releases/#authenticating-with-an-oauth-token) as well.

- [ ] Tag revisions
Previous versions (`v0.1` - `v0.4`) have not been tagged on the master branch, you will want to do so retroactively. Also, when releasing in the future, make sure to tag the commit before pushing. Alternatively, you can schedule a travis build manually after applying the tag retroactively.

420: Make Origin3d::{x,y,z} all have type u32 r=kvark a=fintelia

Fixes #419 

424: swapchain creation: check if selected present mode is supported r=kvark a=Veykril

Implements a simple check as talked about in #350 to fallback to `FIFO` should the selected present mode not be available on the system.

Co-authored-by: Korijn van Golen <k.vangolen@clinicalgraphics.com>
Co-authored-by: Korijn van Golen <korijn@gmail.com>
Co-authored-by: Jonathan Behrens <fintelia@gmail.com>
Co-authored-by: Veykril <lukastw97@gmail.com>
2019-12-30 19:26:21 +00:00
bors[bot]andKorijn van Golen 7d8a1d550c Merge #426
426: configure rust msvc toolchain on windows on travis r=kvark a=Korijn

Closes #425 

@LaylConway's [proposal](https://github.com/gfx-rs/wgpu/issues/425#issuecomment-569737145) was right.

Apparently Travis configures the non-standard GNU toolchain on Windows by default; it's unclear why and kind of defeats the point of Windows CI for this project, so we reconfigure it to use the MSVC toolchain manually in the `before_install` stage.

/cc @kvark

Co-authored-by: Korijn van Golen <k.vangolen@clinicalgraphics.com>
2019-12-30 19:09:18 +00:00
Korijn van Golen 9e7c2da298 configure rust msvc toolchain on windows on travis 2019-12-30 19:40:03 +01:00
Korijn van Golen 52de829094 Copy API key from gfx-portability
Usage OK'd by @grovesNL
2019-12-30 17:31:15 +01:00
Veykril 9eab6fc19e swapchain check present mode, default to vsync if selection is unsupported 2019-12-28 13:34:07 +01:00
Layl 9065e4c1cb Hotfix deadlocks on resource cleanup 2019-12-28 12:38:17 +01:00
Korijn van Golen 2beaaafc6b Update Makefile
Correct filename expression for binaries on Windows
2019-12-28 10:30:32 +01:00
Korijn van Golen 62175d5c26 include FFI header files in package 2019-12-27 22:04:03 +01:00
Korijn van Golen bf65d6dc8e Don't release lib-remote 2019-12-27 22:01:17 +01:00
Jonathan Behrens 461f114ad5 Make Origin3d::{x,y,z} all have type u32 2019-12-25 21:42:49 -05:00
Korijn van Golen 539751dc51 explicitly set -tzip for 7z 2019-12-24 14:54:51 +01:00
Korijn van Golen 0a30650d0d only make packages for rust stable 2019-12-24 14:52:19 +01:00
Korijn van Golen 7b93bf1557 support 7z for travis windows environment (its preinstalled) 2019-12-24 14:52:06 +01:00
Korijn van Golen e434aeddfb make package command repeatable (useful outside of CI) 2019-12-24 14:33:11 +01:00
Korijn van Golen ad797cbd81 makefile package command and travis deploy step 2019-12-24 14:19:43 +01:00
bors[bot]andyanchith 6a963892b5 Merge #400
400: Validate bind group layouts by value r=kvark a=yanchith

This PR widens the comparisons done between two bind group layouts to also consider them equivalent if their vectors of `BindGroupLayoutBinding`s are equal. 

Tested on various modifications of the cube example from wgpu-rs. https://gist.github.com/yanchith/56e15fe35658b14587ff9bfcbd53116f

Fixes #335 

Co-authored-by: yanchith <yanchi.toth@gmail.com>
2019-12-17 17:37:39 +00:00
yanchith e9545c93ed Deduplicate Bind Group Layouts on creation
To make later bind group layout compatibility checks simpler (and
cheaper), deduplicate them on creation. If two bind group layouts with
same descriptors are requested, only one is created and the same id is
returned for both.
2019-12-17 18:32:33 +01:00
Dzmitry Malyshau c0d6cf18e1 Refactor tracker initializers 2019-12-17 00:19:39 -05:00
Dzmitry Malyshau d74c8cb5ae Refactor tracker stitches 2019-12-17 00:19:39 -05:00
Dzmitry Malyshau 109253247d Track render pass attachments in the pass tracker 2019-12-17 00:19:39 -05:00
bors[bot]andDzmitry Malyshau 04e17b3f4f Merge #411
411: Fix tracking of render pass attachments r=grovesNL a=kvark

Sibling of #410 for master
Fixes #407 

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-17 01:52:37 +00:00
Dzmitry Malyshau 38305c62f3 Fix tracking of render pass attachments 2019-12-15 23:10:38 -05:00
bors[bot]andDzmitry Malyshau e2fee60ec5 Merge #408
408: Handle adapter enumeration failures better r=kvark a=kvark

Fixes #406

It appears that the target system could support Vulkan but is misconfigured.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-15 20:21:00 +00:00
Dzmitry Malyshau 033624f160 Handle adapter enumeration failures better 2019-12-15 15:19:35 -05:00
bors[bot]andIstvan Miklos 6b097ab77a Merge #405
405: Derive BufferDescriptor from Serialize/Deserialize r=kvark a=imiklos

cc @kvark @zakorgy

Co-authored-by: Istvan Miklos <istvan.miklos@h-lab.eu>
2019-12-11 14:01:19 +00:00
Istvan Miklos 45be9035b7 Add Serialize/Deserialize derive to BufferDescriptor 2019-12-11 14:43:05 +01:00
bors[bot]andDzmitry Malyshau 615f6f4af2 Merge #403
403: Fix lock token lifetimes r=yanchith a=kvark

Fixes #402

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
mozilla-646613d3969290c44c08b7a43ee00a6dc5cff4ff
2019-12-08 23:59:54 +00:00
Dzmitry Malyshau bd24c20d4c Fix lock token lifetimes 2019-12-08 17:00:30 -05:00
bors[bot]andMac O'Brien 501f9da804 Merge #401
401: Re-export DeviceType r=kvark a=cormac-obrien

Required for gfx-rs/wgpu-rs#137

Co-authored-by: Mac O'Brien <cormac@c-obrien.org>
2019-12-08 00:55:52 +00:00
Mac O'Brien 71cf7f0027 Re-export DeviceType 2019-12-07 15:05:53 -06:00
bors[bot]andMike Hommey ee3f8c69dd Merge #399
399: Run `cargo update` to pick newer compatible versions of dependencies r=kvark a=glandium



Co-authored-by: Mike Hommey <mh@glandium.org>
2019-12-06 16:42:21 +00:00
Mike Hommey 1175fb35f3 Run cargo update to pick newer compatible versions of dependencies 2019-12-06 15:13:05 +09:00
bors[bot]andMike Hommey b89bed128e Merge #397
397: Update smallvec to 1.0 r=kvark a=glandium

This was applied in Firefox in https://hg.mozilla.org/integration/autoland/rev/bb0b7e442651

Co-authored-by: Mike Hommey <mh@glandium.org>
2019-12-06 05:37:04 +00:00
bors[bot]andMike Hommey 6d88a144cf Merge #398
398: Add missing license in wgpu-remote/Cargo.toml r=kvark a=glandium



Co-authored-by: Mike Hommey <mh@glandium.org>
2019-12-06 04:47:12 +00:00
Mike Hommey 72091ace37 Add missing license in wgpu-remote/Cargo.toml 2019-12-06 13:41:42 +09:00
Mike Hommey 74d83fdedd Update smallvec to 1.0 2019-12-06 13:37:30 +09:00
bors[bot]andDzmitry Malyshau 8bdfb30562 Merge #396
396: Remote buffer destruction r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-03 14:05:57 +00:00
Dzmitry Malyshau 486b1b6764 Remote buffer destruction 2019-12-03 08:59:22 -05:00
bors[bot]andDzmitry Malyshau 4fdb54d33a Merge #394
394: Get buffer sub data in wgpu-remote r=kvark a=kvark

Required for `mapReadAsync` implementation in Gecko.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-12-02 22:24:17 +00:00
Dzmitry Malyshau 97766ab300 Get buffer sub data in wgpu-remote 2019-12-02 17:23:04 -05:00
bors[bot]andDzmitry Malyshau a13e40ce5c Merge #391
391: Remote buffer mapping r=kvark a=kvark

Reflects the ongoing changes in Gecko.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-29 21:45:41 +00:00
Dzmitry Malyshau 2f74e227a8 Remote buffer mapping 2019-11-29 16:44:22 -05:00
bors[bot]andDzmitry Malyshau 2006c07a57 Merge #387
387: Stop dynamic offset iteration when the bind groups stop r=grovesNL a=kvark

Fixes #386 

I imagine the code is not performance-optimal and could be improved. This PR focuses on correctness.

Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-29 02:08:19 +00:00
bors[bot]andDzmitry Malyshau be600f3708 Merge #390
390: Buffer creation in wgpu-remote r=kvark a=kvark



Co-authored-by: Dzmitry Malyshau <kvarkus@gmail.com>
2019-11-28 22:19:09 +00:00
Dzmitry Malyshau 605620b20c Buffer creation in wgpu-remote 2019-11-28 17:18:25 -05:00
Dzmitry Malyshau 0880986a97 Stop dynamic offset iteration when the bind groups stop 2019-11-28 14:36:36 -05:00
bors[bot]andLiJinlei 469c086a1a Merge #385
385: Fix build for iOS r=kvark a=grenlight

   ``` 
Compiling wgpu-native v0.4.0 (https://github.com/gfx-rs/wgpu?rev=b51053dc2dc3bbe9b2ba050fde42eeb6405fe092#b51053dc)
error[E0422]: cannot find struct, variant or union type `Surface` in this scope
  --> /Users/LiJinlei/.cargo/git/checkouts/wgpu-53e70f8674b08dd4/b51053d/wgpu-native/src/device.rs:24:24
   |
24 |         Rwh::IOS(h) => Surface {
   |                        ^^^^^^^ not found in this scope
help: possible candidate is found in another module, you can import it into scope
   ``` 

Co-authored-by: LiJinlei <grenlight@icloud.com>
2019-11-27 15:35:30 +00:00