Skip to content

Commit

Permalink
Merge ../wgpu-rs into reunion
Browse files Browse the repository at this point in the history
  • Loading branch information
kvark committed Jun 3, 2021
2 parents eadaa1b + 6566a6c commit 4fc4785
Show file tree
Hide file tree
Showing 100 changed files with 23,141 additions and 10 deletions.
2 changes: 2 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
*.mtl binary
*.obj binary
8 changes: 8 additions & 0 deletions .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
blank_issues_enabled: false
contact_links:
- name: Issue or enhancement in wgpu-core
url: https://github.com/gfx-rs/wgpu/issues/new/choose
about: Issues with or enhancements for the core logic, validation, or the backends should go here.
- name: Question about wgpu
url: https://github.com/gfx-rs/wgpu-rs/discussions/new
about: Any questions about how to use wgpu should go here.
3 changes: 0 additions & 3 deletions .github/ISSUE_TEMPLATE/other.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,4 @@ about: Strange things you want to tell us
title: ''
labels: question
assignees: ''

---


31 changes: 27 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,18 @@ jobs:
- name: Additional core features
run: cargo check --manifest-path wgpu-core/Cargo.toml --features trace --target ${{ env.TARGET }}

webgl_build:
wasm:
name: Web Assembly
runs-on: ubuntu-18.04
env:
RUSTFLAGS: --cfg=web_sys_unstable_apis
steps:
- uses: actions/checkout@v2
- run: rustup target add wasm32-unknown-unknown
- run: cargo build --manifest-path wgpu-core/Cargo.toml --target wasm32-unknown-unknown
- uses: actions/checkout@v2
- run: rustup target add wasm32-unknown-unknown
- name: Check WebGPU
run: cargo check --all-targets --target=wasm32-unknown-unknown
- name: Check WebGL
run: cargo check --all-targets --target=wasm32-unknown-unknown --features webgl

build:
name: ${{ matrix.name }}
Expand Down Expand Up @@ -117,6 +122,20 @@ jobs:
- if: matrix.channel == 'nightly'
run: cargo test -- --nocapture

docs:
runs-on: [ubuntu-18.04]
steps:
- uses: actions/checkout@v2
- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
continue-on-error: true
- name: cargo doc
run: cargo --version; cargo doc --no-deps
continue-on-error: true

lint:
name: Clippy
runs-on: ubuntu-latest
Expand All @@ -132,3 +151,7 @@ jobs:
with:
command: clippy
args: -- -D warnings
- uses: actions-rs/cargo@v1
with:
command: fmt
args: -- --check
45 changes: 45 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
name: Documentation

on:
push:
branches:
- master

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout the code
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Install latest nightly
uses: actions-rs/toolchain@v1
with:
toolchain: nightly
override: true
continue-on-error: true

- name: Add EGL for OpenGL
run: |
sudo apt-get update -y -qq
sudo apt-get install -y -qq libegl1-mesa-dev
- name: Build the docs (nightly)
run: |
cargo +nightly doc --lib --all-features
- name: Build the docs (stable)
run: cargo +stable doc --lib --all-features
if: ${{ failure() }}

- name: Deploy the docs
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
ACCESS_TOKEN: ${{ secrets.WEB_DEPLOY }}
FOLDER: target/doc
REPOSITORY_NAME: gfx-rs/wgpu-rs.github.io
BRANCH: master
TARGET_FOLDER: doc
47 changes: 47 additions & 0 deletions .github/workflows/publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
name: Publish

on:
push:
branches:
- gecko

env:
RUSTFLAGS: --cfg=web_sys_unstable_apis

jobs:
build:
runs-on: ubuntu-latest

steps:
- name: Checkout the code
uses: actions/checkout@v2
with:
persist-credentials: false

- name: Install Rust WASM toolchain
uses: actions-rs/toolchain@v1
with:
toolchain: stable
target: wasm32-unknown-unknown

- name: Build the examples
run: cargo build --release --target wasm32-unknown-unknown --examples

- name: Install wasm-bindgen-cli
run: cargo install wasm-bindgen-cli

- name: Generate JS bindings for the examples
run: |
for i in target/wasm32-unknown-unknown/release/examples/*.wasm;
do
wasm-bindgen --no-typescript --out-dir target/generated --web "$i";
done
- name: Deploy the examples
uses: JamesIves/github-pages-deploy-action@releases/v3
with:
ACCESS_TOKEN: ${{ secrets.WEB_DEPLOY }}
FOLDER: target/generated
REPOSITORY_NAME: gfx-rs/wgpu-rs.github.io
BRANCH: master
TARGET_FOLDER: examples/wasm
15 changes: 12 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,8 +1,17 @@
/target
# Generated by Cargo
# will have compiled files and executables
/target/

# These are backup files generated by rustfmt
**/*.rs.bk
#Cargo.lock

# Other
.fuse_hidden*
.DS_Store

# IDE/Editor configuration files
.vscode
.vs
.idea

# Output from capture example
wgpu/red.png
19 changes: 19 additions & 0 deletions wgpu/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Change Log

### v0.8 (2021-04-29)
- See https://github.com/gfx-rs/wgpu/blob/v0.8/CHANGELOG.md#v08-2021-04-29
- Naga is the default shader conversion path on Metal, Vulkan, and OpenGL
- SPIRV-Cross is optionally enabled with "cross" feature
- All of the examples (except "texture-array") now use WGSL

### v0.7 (2021-01-31)
- See https://github.com/gfx-rs/wgpu/blob/v0.7/CHANGELOG.md#v07-2020-08-30
- Features:
- (beta) WGSL support
- better error messages
- API changes:
- new `ShaderModuleDescriptor`
- new `RenderEncoder`

### v0.6.2 (2020-11-24)
- don't panic in the staging belt if the channel is dropped
Loading

0 comments on commit 4fc4785

Please sign in to comment.