alex/portability
1
0
Fork 0
mirror of https://github.com/italicsjenga/portability.git synced 2024-11-22 15:01:31 +11:00
Code Issues Packages Projects Releases Wiki Activity

Update gfx dependencies

Browse source
This commit is contained in:
Dzmitry Malyshau 2020-04-11 00:25:18 -04:00 committed by Dzmitry Malyshau
parent 7962ce0d8b
commit 3c68e62cdf
5 changed files with 224 additions and 310 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

505
Cargo.lock generated
View file

File diff suppressed because it is too large Load diff

10
Makefile
View file

@ -60,10 +60,12 @@ FULL_LIBRARY_PATH=$(CURDIR)/target/debug
LIBRARY=target/debug/libportability.$(LIB_EXTENSION) LIBRARY=target/debug/libportability.$(LIB_EXTENSION)
LIBRARY_FAST=target/release/libportability.$(LIB_EXTENSION) LIBRARY_FAST=target/release/libportability.$(LIB_EXTENSION)
.PHONY: all rebuild debug release version-debug version-release binding run-native cts clean cherry dota-debug dota-release dota-orig dota-bench-gfx dota-bench-orig dota-bench-gl package memcpy-report .PHONY: all dummy rebuild debug release version-debug version-release binding run-native cts clean cherry dota-debug dota-release dota-orig dota-bench-gfx dota-bench-orig dota-bench-gl package memcpy-report
all: $(NATIVE_TARGET) all: $(NATIVE_TARGET)
dummy:
rebuild: rebuild:
cargo build --manifest-path libportability/Cargo.toml --features $(BACKEND) cargo build --manifest-path libportability/Cargo.toml --features $(BACKEND)
@ -117,12 +119,12 @@ binding: $(BINDING)
$(BINDING): $(VULKAN_DIR)/vulkan/*.h $(BINDING): $(VULKAN_DIR)/vulkan/*.h
bindgen --no-layout-tests --rustfmt-bindings $(VULKAN_DIR)/vulkan/vulkan.h -o $(BINDING) bindgen --no-layout-tests --rustfmt-bindings $(VULKAN_DIR)/vulkan/vulkan.h -o $(BINDING)
$(LIBRARY): libportability*/src/*.rs libportability*/Cargo.toml Cargo.lock $(LIBRARY): dummy
cargo build --manifest-path libportability/Cargo.toml --features $(BACKEND) cargo build --manifest-path libportability/Cargo.toml --features $(BACKEND)
cargo build --manifest-path libportability-icd/Cargo.toml --features $(BACKEND) cargo build --manifest-path libportability-icd/Cargo.toml --features $(BACKEND),portability-gfx/env_logger
mkdir -p target/native mkdir -p target/native
$(LIBRARY_FAST): libportability*/src/*.rs libportability*/Cargo.toml Cargo.lock $(LIBRARY_FAST): dummy
cargo build --release --manifest-path libportability/Cargo.toml --features $(BACKEND) cargo build --release --manifest-path libportability/Cargo.toml --features $(BACKEND)
cargo build --release --manifest-path libportability-icd/Cargo.toml --features $(BACKEND) cargo build --release --manifest-path libportability-icd/Cargo.toml --features $(BACKEND)

12
libportability-gfx/Cargo.toml
View file

@ -20,16 +20,10 @@ metal-capture = ["gfx-backend-metal/auto-capture"]
[dependencies] [dependencies]
copyless = "0.1.1" copyless = "0.1.1"
env_logger = { version = "0.5", optional = true }
lazy_static = "1" lazy_static = "1"
log = { version = "0.4", features = ["release_max_level_error"] } log = { version = "0.4", features = ["release_max_level_error"] }
renderdoc = { version = "0.3", optional = true }
[dependencies.env_logger]
version = "0.5"
optional = true
[dependencies.renderdoc]
version = "0.3"
optional = true
[dependencies.hal] [dependencies.hal]
package = "gfx-hal" package = "gfx-hal"
@ -68,5 +62,5 @@ optional = true
[dependencies.gfx-auxil] [dependencies.gfx-auxil]
git = "https://github.com/gfx-rs/gfx" git = "https://github.com/gfx-rs/gfx"
# path = "../../gfx/src/auxil/auxil" #path = "../../gfx/src/auxil/auxil"
optional = true optional = true

4
libportability-gfx/src/impls.rs
View file

@ -1000,6 +1000,10 @@ lazy_static! {
extensionName: [0; 256], // VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME extensionName: [0; 256], // VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_EXTENSION_NAME
specVersion: VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION, specVersion: VK_KHR_GET_PHYSICAL_DEVICE_PROPERTIES_2_SPEC_VERSION,
}, },
VkExtensionProperties {
extensionName: [0; 256], // VK_KHR_GET_SURFACE_CAPABILITIES_2_EXTENSION_NAME
specVersion: VK_KHR_GET_SURFACE_CAPABILITIES_2_SPEC_VERSION,
},
]; ];
for (&name, extension) in INSTANCE_EXTENSION_NAMES.iter().zip(&mut extensions) { for (&name, extension) in INSTANCE_EXTENSION_NAMES.iter().zip(&mut extensions) {

3
libportability/Cargo.toml
View file

@ -14,7 +14,8 @@ crate-type = ["staticlib", "cdylib"]
[features] [features]
default = [] default = []
debug = ["portability-gfx/env_logger", "portability-gfx/nightly"] #debug = ["portability-gfx/env_logger", "portability-gfx/nightly"]
debug = ["portability-gfx/env_logger"]
dx12 = ["portability-gfx/gfx-backend-dx12"] dx12 = ["portability-gfx/gfx-backend-dx12"]
dx11 = ["portability-gfx/gfx-backend-dx11"] dx11 = ["portability-gfx/gfx-backend-dx11"]
metal = ["portability-gfx/gfx-backend-metal"] metal = ["portability-gfx/gfx-backend-metal"]