Skip to content

Commit 5297132

Browse files
committed
Remove render parts
1 parent e6ded32 commit 5297132

File tree

253 files changed

+11
-11175
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

253 files changed

+11
-11175
lines changed

Cargo.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,5 @@ members = [
99
"src/backend/vulkan",
1010
"src/hal",
1111
"src/warden",
12-
"src/render",
13-
"examples/hal",
14-
"examples/render/quad_render",
12+
"examples",
1513
]

Makefile

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
RUST_BACKTRACE:=1
22
EXCLUDES:=
3-
FEATURES_RENDER:=
43
FEATURES_EXTRA:=mint serialize
54
FEATURES_HAL:=
65
FEATURES_HAL2:=
7-
CMD_QUAD_RENDER:=cargo check
86

97
SDL2_DEST=$(HOME)/deps
108
SDL2_CONFIG=$(SDL2_DEST)/usr/bin/sdl2-config
@@ -33,9 +31,7 @@ else
3331
endif
3432
ifeq ($(UNAME_S),Darwin)
3533
EXCLUDES+= --exclude gfx-backend-vulkan
36-
EXCLUDES+= --exclude quad-render
3734
FEATURES_HAL=metal
38-
CMD_QUAD_RENDER=pwd
3935
endif
4036
endif
4137

@@ -50,16 +46,14 @@ help:
5046
check:
5147
@echo "Note: excluding \`warden\` here, since it depends on serialization"
5248
cargo check --all $(EXCLUDES) --exclude gfx-warden
53-
cd examples/hal && cargo check --features "gl"
54-
cd examples/hal && cargo check --features "$(FEATURES_HAL)"
55-
cd examples/hal && cargo check --features "$(FEATURES_HAL2)"
56-
cd examples/render/quad_render && $(CMD_QUAD_RENDER)
49+
cd examples && cargo check --features "gl"
50+
cd examples && cargo check --features "$(FEATURES_HAL)"
51+
cd examples && cargo check --features "$(FEATURES_HAL2)"
5752
cd src/warden && cargo check --no-default-features
5853
cd src/warden && cargo check --features "env_logger gl gl-headless $(FEATURES_HAL) $(FEATURES_HAL2)"
5954

6055
test:
6156
cargo test --all $(EXCLUDES)
62-
cd src/render && cargo test --features "$(FEATURES_RENDER) $(FEATURES_EXTRA)"
6357

6458
reftests:
6559
cd src/warden && cargo run --features "$(FEATURES_HAL) $(FEATURES_HAL2)" -- local #TODO: gl

examples/hal/Cargo.toml renamed to examples/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
name = "hal-examples"
33
version = "0.1.0"
44
publish = false
5-
workspace = "../.."
5+
workspace = ".."
66

77
[features]
88
default = []
@@ -26,26 +26,26 @@ image = "0.18"
2626
log = "0.4"
2727
winit = "0.13"
2828
glsl-to-spirv = "0.1.4"
29-
gfx-hal = { path = "../../src/hal", version = "0.1" }
29+
gfx-hal = { path = "../src/hal", version = "0.1" }
3030

3131
[dependencies.gfx-backend-gl]
32-
path = "../../src/backend/gl"
32+
path = "../src/backend/gl"
3333
version = "0.1"
3434
features = ["glutin"]
3535
optional = true
3636

3737
[dependencies.gfx-backend-vulkan]
38-
path = "../../src/backend/vulkan"
38+
path = "../src/backend/vulkan"
3939
version = "0.1"
4040
#features = ["glsl-to-spirv"]
4141
optional = true
4242

4343
[target.'cfg(target_os = "macos")'.dependencies.gfx-backend-metal]
44-
path = "../../src/backend/metal"
44+
path = "../src/backend/metal"
4545
version = "0.1"
4646
optional = true
4747

4848
[target.'cfg(windows)'.dependencies.gfx-backend-dx12]
49-
path = "../../src/backend/dx12"
49+
path = "../src/backend/dx12"
5050
version = "0.1"
5151
optional = true

examples/README.md

+1-7
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,12 @@ This directory contains a collection of examples which use the various gfx APIs.
44

55
The examples are split across three directories, each pertaining to the gfx API they are using.
66

7-
1. `examples/hal` contains low level examples which target the gfx Hardware Abstraction Layer (HAL).
8-
1. `examples/render` shows how to use the render crate directly.
9-
1. `examples/support` shows how to use the support crate, to demonstrate how you can build an application using minimal setup.
10-
11-
_Please note that `support` is still being updated, so `support` examples will not run at the moment._
12-
137
To run the examples, set your working directory to the examples directory and execute
148
`cargo run --bin <example> --features=<backend>`, where `<example>` is the example you want to run and `<backend>` is the backend you would like to use (`vulkan`, `dx12`, `metal`, or `gl`).
159

1610
For example, to run the `quad` example on the `vulkan` backend, try:
1711

18-
cd examples/hal
12+
cd examples
1913
cargo run --bin quad --features=vulkan
2014

2115
If you run the examples for the first time, it may take some time because all dependencies must be compiled too.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

examples/render/gamma/README.md

-7
This file was deleted.

examples/render/gamma/compile.cmd

-5
This file was deleted.

examples/render/gamma/data/pixel.fx

-484 Bytes
Binary file not shown.

examples/render/gamma/data/vertex.fx

-560 Bytes
Binary file not shown.

examples/render/gamma/main.rs

-111
This file was deleted.

examples/render/gamma/screenshot.png

-35.9 KB
Binary file not shown.

examples/render/gamma/shader/quad.hlsl

-16
This file was deleted.

examples/render/gamma/shader/quad_150.glslf

-8
This file was deleted.

examples/render/gamma/shader/quad_150.glslv

-10
This file was deleted.

examples/render/quad_render/Cargo.toml

-29
This file was deleted.

examples/render/quad_render/frag.spv

-720 Bytes
Binary file not shown.

examples/render/quad_render/logo.png

-24.3 KB
Binary file not shown.

0 commit comments

Comments
 (0)