-
Notifications
You must be signed in to change notification settings - Fork 543
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'll' of github.com:gfx-rs/gfx into ll
- Loading branch information
Showing
56 changed files
with
1,954 additions
and
1,172 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,64 +1,6 @@ | ||
| ## Change Log | ||
|
|
||
| ### v0.16 (2017-05-11) | ||
| - `RawGlobal` PSO component ([#1262](https://github.com/gfx-rs/gfx/pull/1262)) | ||
| - run-time configurable instance rate ([#1256](https://github.com/gfx-rs/gfx/pull/1256)) | ||
| - more convenience traits are derived ([#1249](https://github.com/gfx-rs/gfx/pull/1249)) | ||
| - optional cgmath support ([#1242](https://github.com/gfx-rs/gfx/pull/1242)) | ||
|
|
||
| ### v0.15 (2017-04-22) | ||
| - optional serialization support ([#1234](https://github.com/gfx-rs/gfx/pull/1234)) | ||
| - better GL state caching ([#1221](https://github.com/gfx-rs/gfx/pull/1221)) | ||
| - GL texture staging ([#1202](https://github.com/gfx-rs/gfx/pull/1202)) | ||
| - primitives with adjacency ([#1154](https://github.com/gfx-rs/gfx/pull/1154)) | ||
| - metal backend improvements ([#1165](https://github.com/gfx-rs/gfx/pull/1165), [#1175](https://github.com/gfx-rs/gfx/pull/1175)) | ||
| - resource mapping improvements | ||
|
|
||
| ### v0.14 (2017-01-16) | ||
| - fixed `Fence` and `Sync` bounds ([#1095](https://github.com/gfx-rs/gfx/pull/1095)) | ||
| - dx11 buffer mapping support ([#1099](https://github.com/gfx-rs/gfx/pull/1099), [#1105](https://github.com/gfx-rs/gfx/pull/1105)) | ||
| - redesigned resource usage model for next-gen compatibility ([#1123](https://github.com/gfx-rs/gfx/pull/1123)) | ||
| - buffer copy support ([#1129](https://github.com/gfx-rs/gfx/pull/1129)) | ||
| - fixed and improved some errors ([#1137](https://github.com/gfx-rs/gfx/pull/1137), [#1138](https://github.com/gfx-rs/gfx/pull/1138)) | ||
| - application launcher revamp and resize support ([#1121](https://github.com/gfx-rs/gfx/pull/1121)) | ||
|
|
||
| ### v0.13 (2016-12-18) | ||
| - experimental Metal backend ([#969](https://github.com/gfx-rs/gfx/pull/969), [#1049](https://github.com/gfx-rs/gfx/pull/1049), [#1050](https://github.com/gfx-rs/gfx/pull/1050)) | ||
| - persistent mapping ([#1026](https://github.com/gfx-rs/gfx/pull/1026)) | ||
| - tessellation support ([#1027](https://github.com/gfx-rs/gfx/pull/1027), [#1088](https://github.com/gfx-rs/gfx/pull/1088)) | ||
| - new examples: gamma, particle, terrain_tessellated | ||
| - better PSO error messages, constant offset checks ([#1004](https://github.com/gfx-rs/gfx/pull/1004)) | ||
| - unified scissor: now Y-reversed on GL ([#1092](https://github.com/gfx-rs/gfx/pull/1092)) | ||
| - `const` resources are now called `immutable` | ||
| - faster handle clones and cleaner core API ([#1031](https://github.com/gfx-rs/gfx/pull/1031)) | ||
|
|
||
| ### v0.12 (2016-06-23) | ||
| - Android / GLES support ([#993](https://github.com/gfx-rs/gfx/pull/993)) | ||
| - GL unsigned int samplers ([#991](https://github.com/gfx-rs/gfx/pull/991)) | ||
| - better errors ([#976](https://github.com/gfx-rs/gfx/pull/976)) | ||
| - better GLSL pre core reflection | ||
|
|
||
| ### v0.11 (2016-04-30) | ||
| - modified `Slice` API ([#955](https://github.com/gfx-rs/gfx/pull/955)) | ||
| - fixed GL blending where it's not in the core ([#953](https://github.com/gfx-rs/gfx/pull/953)) | ||
| - raw PSO components for vertex buffers and render targets | ||
|
|
||
| ### v0.10.2 (2016-04-15) | ||
| - fixed get_texel_count ([#937](https://github.com/gfx-rs/gfx/pull/937)) | ||
|
|
||
| ### v0.10.1 (2016-03-26) | ||
| - fixed update_texture ([#912](https://github.com/gfx-rs/gfx/pull/912)) | ||
|
|
||
| ### v0.10 (2016-03-21) | ||
| - Direct3D 11 backend ([#861](https://github.com/gfx-rs/gfx/pull/861)) | ||
|
|
||
| ### v0.9.2 (2016-02-24) | ||
| - fixed universal format views ([#886](https://github.com/gfx-rs/gfx/pull/886)) | ||
| - fixed constant buffer binding ([#828](https://github.com/gfx-rs/gfx/pull/828)) | ||
|
|
||
| ### v0.9.1 (2016-02-19) | ||
| - window resize support ([#879](https://github.com/gfx-rs/gfx/pull/879)) | ||
| - deriving windows attributes from target formats ([#874](https://github.com/gfx-rs/gfx/pull/874)) | ||
|
|
||
| ### v0.9 (2016-01-22) | ||
| - Pipepeline State Object revolution ([#828](https://github.com/gfx-rs/gfx/pull/828)) | ||
| ### v0.1 (TBD) | ||
| - `gfx_hal`: graphics hardware abstraction layer | ||
| - `gfx_backend_*`: Vulkan, D3D12, Metal | ||
| - `gfx_render`: safer wrapper at a higher level |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,75 @@ | ||
| RUST_BACKTRACE:=1 | ||
| EXCLUDES:= | ||
| FEATURES_RENDER:= | ||
| FEATURES_RENDER_ADD:= mint serialize | ||
| FEATURES_QUAD:= | ||
| FEATURES_QUAD_ADD:= | ||
| FEATURES_QUAD2:= | ||
| CMD_QUAD_RENDER:=cargo check | ||
|
|
||
| SDL2_DEST=$(HOME)/deps | ||
| SDL2_CONFIG=$(SDL2_DEST)/usr/bin/sdl2-config | ||
| SDL2_PPA=http://ppa.launchpad.net/zoogie/sdl2-snapshots/ubuntu/pool/main/libs/libsdl2 | ||
|
|
||
|
|
||
| ifeq ($(OS),Windows_NT) | ||
| EXCLUDES+= --exclude gfx_backend_metal | ||
| FEATURES_QUAD=vulkan | ||
| ifeq ($(TARGET),x86_64-pc-windows-gnu) | ||
| # No d3d12 support on GNU windows ATM | ||
| # context: https://github.com/gfx-rs/gfx/pull/1417 | ||
| EXCLUDES+= --exclude gfx_backend_dx12 | ||
| else | ||
| FEATURES_QUAD2=dx12 | ||
| endif | ||
| else | ||
| UNAME_S:=$(shell uname -s) | ||
| EXCLUDES+= --exclude gfx_device_dx11 | ||
| EXCLUDES+= --exclude gfx_backend_dx12 | ||
| GLUTIN_HEADLESS_FEATURE="--features headless" #TODO? | ||
| ifeq ($(UNAME_S),Linux) | ||
| EXCLUDES+= --exclude gfx_backend_metal | ||
| FEATURES_QUAD=vulkan | ||
| endif | ||
| ifeq ($(UNAME_S),Darwin) | ||
| EXCLUDES+= --exclude gfx_backend_vulkan | ||
| EXCLUDES+= --exclude quad_render | ||
| FEATURES_QUAD=metal | ||
| FEATURES_QUAD_ADD=metal_argument_buffer | ||
| CMD_QUAD_RENDER=pwd | ||
| endif | ||
| endif | ||
|
|
||
|
|
||
| .PHONY: all check render ex-quad travis-sdl2 | ||
|
|
||
| all: check render ex-quad ex-quad-render | ||
|
|
||
| check: | ||
| cargo check --all $(EXCLUDES) | ||
| cargo test --all $(EXCLUDES) | ||
|
|
||
| render: | ||
| cd src/render && cargo test --features "$(FEATURES_RENDER)" | ||
| cd src/render && cargo test --features "$(FEATURES_RENDER) $(FEATURES_RENDER_ADD)" | ||
|
|
||
| ex-quad: | ||
| cd examples/core/quad && cargo check --features "gl" | ||
| cd examples/core/quad && cargo check --features "$(FEATURES_QUAD2)" | ||
| cd examples/core/quad && cargo check --features "$(FEATURES_QUAD)" | ||
| cd examples/core/quad && cargo check --features "$(FEATURES_QUAD) $(FEATURES_QUAD_ADD)" | ||
|
|
||
| ex-quad-render: | ||
| cd examples/render/quad_render && $(CMD_QUAD_RENDER) | ||
|
|
||
| travis-sdl2: | ||
| #TODO | ||
| #if [ -e $(SDL2_CONFIG) ]; then exit 1; fi | ||
| #mkdir -p $(SDL2_DEST) | ||
| #test -f $(SDL2_DEST)/dev.deb || curl -sLo $(SDL2_DEST)/dev.deb $(SDL2_PPA)/libsdl2-dev_2.0.3+z4~20140315-8621-1ppa1precise1_amd64.deb | ||
| #test -f $(SDL2_DEST)/bin.deb || curl -sLo $(SDL2_DEST)/bin.deb $(SDL2_PPA)/libsdl2_2.0.3+z4~20140315-8621-1ppa1precise1_amd64.deb | ||
| #dpkg-deb -x $(SDL2_DEST)/bin.deb . | ||
| #dpkg-deb -x $(SDL2_DEST)/dev.deb . | ||
| #sed -e s,/usr,$(SDL2_DEST),g $(SDL2_CONFIG) > $(SDL2_CONFIG).new | ||
| #mv $(SDL2_CONFIG).new $(SDL2_CONFIG) | ||
| #chmod a+x $(SDL2_CONFIG) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,26 @@ | ||
| skip_branch_with_pr: true | ||
| branches: | ||
| except: | ||
| - staging.tmp | ||
| environment: | ||
| global: | ||
| PATH: '%PATH%;C:\msys64\mingw64\bin;C:\msys64\usr\bin;%USERPROFILE%\.cargo\bin' | ||
| RUST_BACKTRACE: full | ||
| matrix: | ||
| - TARGET: 1.20.0-x86_64-pc-windows | ||
| COMPILER: gnu | ||
| - TARGET: 1.20.0-x86_64-pc-windows | ||
| COMPILER: msvc | ||
| - TARGET: nightly-x86_64-pc-windows | ||
| COMPILER: msvc | ||
| - CHANNEL: stable | ||
| TARGET: x86_64-pc-windows-msvc | ||
| - CHANNEL: stable | ||
| TARGET: x86_64-pc-windows-gnu | ||
| - CHANNEL: nightly | ||
| TARGET: x86_64-pc-windows-msvc | ||
|
|
||
| install: | ||
| - if %COMPILER%==gnu choco install -y mingw | ||
| - ps: Start-FileDownload "https://static.rust-lang.org/dist/rust-${env:TARGET}-${env:COMPILER}.exe" -FileName "rust-install.exe" | ||
| - ps: .\rust-install.exe /VERYSILENT /NORESTART /DIR="C:\rust" | Out-Null | ||
| - ps: $env:PATH="$env:PATH;C:\rust\bin;C:\tools\mingw64\bin" | ||
| - if %COMPILER%==gnu gcc -v | ||
| - curl -sSf -o rustup-init.exe https://win.rustup.rs | ||
| - rustup-init -yv --default-toolchain %CHANNEL% --default-host %TARGET% | ||
| #- bash -lc "pacman -S --noconfirm mingw-w64-x86_64-cmake" | ||
| - rustc -vV | ||
| - cargo -vV | ||
| build_script: | ||
| # No d3d12 support on GNU windows ATM | ||
| # context: https://github.com/gfx-rs/gfx/pull/1417 | ||
| - if %COMPILER%==gnu ( | ||
| cargo build --all | ||
| --exclude gfx_window_glfw | ||
| --exclude gfx_window_sdl | ||
| --exclude gfx_backend_metal | ||
| --exclude gfx_backend_dx12 | ||
| --exclude gfx_window_dxgi | ||
| ) else ( | ||
| cargo build --all | ||
| --exclude gfx_window_glfw | ||
| --exclude gfx_window_sdl | ||
| --exclude gfx_backend_metal | ||
| ) | ||
|
|
||
| build: false | ||
| test_script: | ||
| - if %COMPILER%==gnu ( | ||
| cargo test --all | ||
| --exclude gfx_window_glfw | ||
| --exclude gfx_window_sdl | ||
| --exclude gfx_backend_metal | ||
| --exclude gfx_backend_dx12 | ||
| --exclude gfx_window_dxgi | ||
| ) else ( | ||
| cargo test --all | ||
| --exclude gfx_window_glfw | ||
| --exclude gfx_window_sdl | ||
| --exclude gfx_backend_metal | ||
| ) | ||
| - C:\MinGW\bin\mingw32-make.exe all |
Oops, something went wrong.