Skip to content

Commit

Permalink
Merge gfx-rs#9
Browse files Browse the repository at this point in the history
9: Restructure the repo to host multiple crates r=grovesNL a=kvark

As a follow-up, I'll rename this repository to just `wgpu`.

Co-authored-by: Dzmitry Malyshau <kvark@mozilla.com>
  • Loading branch information
bors[bot] and kvark committed Sep 19, 2018
2 parents de806ee + 9ecc25e commit 99edaa2
Show file tree
Hide file tree
Showing 21 changed files with 56 additions and 49 deletions.
26 changes: 13 additions & 13 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

20 changes: 4 additions & 16 deletions Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
[package]
name = "gpu-native"
version = "0.1.0"
authors = ["Dzmitry Malyshau <kvark@mozilla.com>"]

[features]
default = []

[dependencies]
bitflags = "1.0"
gfx-hal = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05" } # required by gfx-memory
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
gfx-memory = { git = "https://github.com/gfx-rs/gfx-memory", rev = "483d64d" }
[workspace]
members = [
"wgpu-native",
]
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# WebGPU-native
# WebGPU
[![Build Status](https://travis-ci.org/gfx-rs/wgpu-native.svg)](https://travis-ci.org/gfx-rs/wgpu-native)
[![Gitter](https://badges.gitter.im/gfx-rs/gfx.svg)](https://gitter.im/gfx-rs/gfx)

Expand Down
19 changes: 0 additions & 19 deletions examples/hello_triangle.rs

This file was deleted.

19 changes: 19 additions & 0 deletions wgpu-native/Cargo.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
[package]
name = "wgpu-native"
version = "0.1.0"
authors = [
"Dzmitry Malyshau <kvark@mozilla.com>",
"Joshua Groves <josh@joshgroves.com>",
]

[features]
default = []

[dependencies]
bitflags = "1.0"
gfx-hal = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05" } # required by gfx-memory
gfx-backend-empty = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05" }
gfx-backend-vulkan = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
gfx-backend-dx12 = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
gfx-backend-metal = { git = "https://github.com/gfx-rs/gfx", rev = "a435a05", optional = true }
gfx-memory = { git = "https://github.com/gfx-rs/gfx-memory", rev = "483d64d" }
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
19 changes: 19 additions & 0 deletions wgpu-native/examples/hello_triangle.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
extern crate wgpu_native as wgn;

fn main() {
let instance = wgn::create_instance();
let adapter = wgn::instance_get_adapter(instance, wgn::AdapterDescriptor {
power_preference: wgn::PowerPreference::LowPower,
});
let device = wgn::adapter_create_device(adapter, wgn::DeviceDescriptor {
extensions: wgn::Extensions {
anisotropic_filtering: false,
},
});
let _vs = wgn::device_create_shader_module(device, wgn::ShaderModuleDescriptor {
code: include_bytes!("./data/hello_triangle.vert.spv"),
});
let _fs = wgn::device_create_shader_module(device, wgn::ShaderModuleDescriptor {
code: include_bytes!("./data/hello_triangle.frag.spv"),
});
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

0 comments on commit 99edaa2

Please sign in to comment.