alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Restructure of the entire project

Browse source
This commit is contained in:
maik klein 2016-12-09 20:15:59 +01:00
parent 867d3cddc8
commit 6f89804efd
20 changed files with 27 additions and 2728 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
ash/Cargo.lock → Cargo.lock generated
View file

4
vk_loader/Cargo.toml → Cargo.toml
View file

@ -1,8 +1,8 @@
[package] [package]
name = "vk_loader" name = "ash"
version = "0.1.0" version = "0.1.0"
authors = ["maik klein <maikklein@googlemail.com>"] authors = ["maik klein <maikklein@googlemail.com>"]
[dependencies] [dependencies]
shared_library = "0.1.5" shared_library = "0.1.5"
glfw = "0.11.0"

6
Cargo.toml1
View file

@ -1,6 +0,0 @@
[workspace]
members = [
"vk_loader",
"ash",
"examples",
]

13
ash/Cargo.toml
View file

@ -1,13 +0,0 @@
[package]
name = "ash"
version = "0.1.0"
authors = ["maik klein <maikklein@googlemail.com>"]
[dependencies]
lazy_static = "0.2.1"
shared_library = "0.1.5"
glfw = "0.9.1"
bitflags = "0.7.0"
vk_loader = { version = "0.1.0", path = "../vk_loader"}
vk_loader2 = { version = "0.1.0", path = "../vk_loader2"}

2
ash/src/prelude.rs
View file

@ -1,2 +0,0 @@
use vk_loader2;
pub type VkResult<T> = Result<T, vk_loader2::Result>;

37
examples/Cargo.lock generated
View file

@ -4,20 +4,14 @@ version = "0.1.0"
dependencies = [ dependencies = [
"ash 0.1.0", "ash 0.1.0",
"glfw 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", "glfw 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"vk_loader 0.1.0",
"vk_loader2 0.1.0",
] ]
[[package]] [[package]]
name = "ash" name = "ash"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "glfw 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glfw 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)",
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)", "shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
"vk_loader 0.1.0",
"vk_loader2 0.1.0",
] ]
[[package]] [[package]]
@ -60,6 +54,20 @@ dependencies = [
"semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)", "semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "glfw"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
"enum_primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
"glfw-sys 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
"log 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
"num 0.1.34 (registry+https://github.com/rust-lang/crates.io-index)",
"semver 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]] [[package]]
name = "glfw-sys" name = "glfw-sys"
version = "3.2.0" version = "3.2.0"
@ -184,25 +192,12 @@ dependencies = [
"libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)", "libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
] ]
[[package]]
name = "vk_loader"
version = "0.1.0"
dependencies = [
"shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "vk_loader2"
version = "0.1.0"
dependencies = [
"shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[metadata] [metadata]
"checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d" "checksum bitflags 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "aad18937a628ec6abcd26d1489012cc0e18c21798210f491af69ded9b881106d"
"checksum cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978" "checksum cmake 0.1.17 (registry+https://github.com/rust-lang/crates.io-index)" = "dfcf5bcece56ef953b8ea042509e9dcbdfe97820b7e20d86beb53df30ed94978"
"checksum enum_primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79eff5be92a4d7d5bddf7daa7d650717ea71628634efe6ca7bcda85b2183c23" "checksum enum_primitive 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f79eff5be92a4d7d5bddf7daa7d650717ea71628634efe6ca7bcda85b2183c23"
"checksum gcc 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "dcb000abd6df9df4c637f75190297ebe56c1d7e66b56bbf3b4aa7aece15f61a2" "checksum gcc 0.3.32 (registry+https://github.com/rust-lang/crates.io-index)" = "dcb000abd6df9df4c637f75190297ebe56c1d7e66b56bbf3b4aa7aece15f61a2"
"checksum glfw 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a24b2a1988d70ae50fe2744927cc3816439d7b28ffb3e9a9bbd8acae7db68d00"
"checksum glfw 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b14e68c4ccefdf293ecb65390a5761971b83fcfc54d153a5b73d438327633965" "checksum glfw 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b14e68c4ccefdf293ecb65390a5761971b83fcfc54d153a5b73d438327633965"
"checksum glfw-sys 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaff144079cb22d6f17009e29e87c02f5fd6c4669093ce12b0b2faa6027f0d23" "checksum glfw-sys 3.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "eaff144079cb22d6f17009e29e87c02f5fd6c4669093ce12b0b2faa6027f0d23"
"checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f" "checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"

4
examples/Cargo.toml
View file

@ -5,6 +5,4 @@ authors = ["maik klein <maikklein@googlemail.com>"]
[dependencies] [dependencies]
glfw = "0.9.1" glfw = "0.9.1"
vk_loader = { version = "0.1.0", path = "../vk_loader"} ash = { version = "0.1.0", path = "../"}
vk_loader2 = { version = "0.1.0", path = "../vk_loader2"}
ash = { version = "0.1.0", path = "../ash"}

4
examples/src/main.rs
View file

@ -1,10 +1,10 @@
#![allow(dead_code)] #![allow(dead_code)]
#[macro_use]
extern crate ash; extern crate ash;
#[macro_use]
extern crate vk_loader2 as vk;
extern crate glfw; extern crate glfw;
use ash::vk;
use std::default::Default; use std::default::Default;
use glfw::*; use glfw::*;
use ash::entry::Entry; use ash::entry::Entry;

2
ash/src/device.rs → src/device.rs
View file

@ -2,7 +2,7 @@
use prelude::*; use prelude::*;
use std::ptr; use std::ptr;
use std::mem; use std::mem;
use vk_loader2 as vk; use vk;
pub struct Device<'r> { pub struct Device<'r> {

2
ash/src/entry.rs → src/entry.rs
View file

@ -1,7 +1,7 @@
use prelude::*; use prelude::*;
use std::mem; use std::mem;
use std::ptr; use std::ptr;
use vk_loader2 as vk; use vk;
use instance::Instance; use instance::Instance;
use shared_library::dynamic_library::DynamicLibrary; use shared_library::dynamic_library::DynamicLibrary;
use std::path::Path; use std::path::Path;

2
ash/src/instance.rs → src/instance.rs
View file

@ -4,7 +4,7 @@ use std::ptr;
use std::mem; use std::mem;
use std::os::raw::*; use std::os::raw::*;
use std::path::Path; use std::path::Path;
use vk_loader2 as vk; use vk;
use device::Device; use device::Device;
use shared_library::dynamic_library::DynamicLibrary; use shared_library::dynamic_library::DynamicLibrary;

3
ash/src/lib.rs → src/lib.rs
View file

@ -1,9 +1,8 @@
#[macro_use] #[macro_use]
extern crate shared_library; extern crate shared_library;
#[macro_use]
extern crate vk_loader2;
pub mod instance; pub mod instance;
pub mod device; pub mod device;
pub mod entry; pub mod entry;
pub mod prelude; pub mod prelude;
pub mod vk;

2
src/prelude.rs Normal file
View file

@ -0,0 +1,2 @@
use vk;
pub type VkResult<T> = Result<T, vk::Result>;

0
vk_loader2/src/lib.rs → src/vk.rs
View file

1
vk_loader/.gitignore vendored
View file

@ -1 +0,0 @@
target

30
vk_loader/Cargo.lock generated
View file

@ -1,30 +0,0 @@
[root]
name = "vk_loader"
version = "0.1.0"
dependencies = [
"shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "lazy_static"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libc"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "shared_library"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[metadata]
"checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"
"checksum libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "23e3757828fa702a20072c37ff47938e9dd331b92fac6e223d26d4b7a55f7ee2"
"checksum shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb04126b6fcfd2710fb5b6d18f4207b6c535f2850a7e1a43bcd526d44f30a79a"

2604
vk_loader/src/lib.rs
View file

File diff suppressed because it is too large Load diff

1
vk_loader2/.gitignore vendored
View file

@ -1 +0,0 @@
target

30
vk_loader2/Cargo.lock generated
View file

@ -1,30 +0,0 @@
[root]
name = "vk_loader"
version = "0.1.0"
dependencies = [
"shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
]
[[package]]
name = "lazy_static"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "libc"
version = "0.2.15"
source = "registry+https://github.com/rust-lang/crates.io-index"
[[package]]
name = "shared_library"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
dependencies = [
"lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
"libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)",
]
[metadata]
"checksum lazy_static 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "49247ec2a285bb3dcb23cbd9c35193c025e7251bfce77c1d5da97e6362dffe7f"
"checksum libc 0.2.15 (registry+https://github.com/rust-lang/crates.io-index)" = "23e3757828fa702a20072c37ff47938e9dd331b92fac6e223d26d4b7a55f7ee2"
"checksum shared_library 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "fb04126b6fcfd2710fb5b6d18f4207b6c535f2850a7e1a43bcd526d44f30a79a"

8
vk_loader2/Cargo.toml
View file

@ -1,8 +0,0 @@
[package]
name = "vk_loader2"
version = "0.1.0"
authors = ["maik klein <maikklein@googlemail.com>"]
[dependencies]
shared_library = "0.1.5"