diff --git a/Cargo.toml b/Cargo.toml index 858d2753cc..ff504818d8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -6,7 +6,8 @@ members = [ # default members "benches", - "examples", + "examples/features", + # "examples/standalone/*", "lock-analyzer", "naga-cli", "naga", @@ -24,7 +25,8 @@ members = [ exclude = [] default-members = [ "benches", - "examples", + "examples/features", + # "examples/standalone/*", "lock-analyzer", "naga-cli", "naga", diff --git a/examples/Cargo.toml b/examples/features/Cargo.toml similarity index 100% rename from examples/Cargo.toml rename to examples/features/Cargo.toml diff --git a/examples/src/boids/README.md b/examples/features/src/boids/README.md similarity index 100% rename from examples/src/boids/README.md rename to examples/features/src/boids/README.md diff --git a/examples/src/boids/compute.wgsl b/examples/features/src/boids/compute.wgsl similarity index 100% rename from examples/src/boids/compute.wgsl rename to examples/features/src/boids/compute.wgsl diff --git a/examples/src/boids/draw.wgsl b/examples/features/src/boids/draw.wgsl similarity index 100% rename from examples/src/boids/draw.wgsl rename to examples/features/src/boids/draw.wgsl diff --git a/examples/src/boids/mod.rs b/examples/features/src/boids/mod.rs similarity index 99% rename from examples/src/boids/mod.rs rename to examples/features/src/boids/mod.rs index 6971a3ef18..bef7256617 100644 --- a/examples/src/boids/mod.rs +++ b/examples/features/src/boids/mod.rs @@ -327,7 +327,7 @@ pub fn main() { static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "boids", // Generated on 1080ti on Vk/Windows - image_path: "/examples/src/boids/screenshot.png", + image_path: "/examples/features/src/boids/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/boids/screenshot.png b/examples/features/src/boids/screenshot.png similarity index 100% rename from examples/src/boids/screenshot.png rename to examples/features/src/boids/screenshot.png diff --git a/examples/src/bunnymark/README.md b/examples/features/src/bunnymark/README.md similarity index 100% rename from examples/src/bunnymark/README.md rename to examples/features/src/bunnymark/README.md diff --git a/examples/src/bunnymark/mod.rs b/examples/features/src/bunnymark/mod.rs similarity index 98% rename from examples/src/bunnymark/mod.rs rename to examples/features/src/bunnymark/mod.rs index 9158d17c11..8ea7b83d43 100644 --- a/examples/src/bunnymark/mod.rs +++ b/examples/features/src/bunnymark/mod.rs @@ -151,7 +151,7 @@ impl crate::framework::Example for Example { let shader = device.create_shader_module(wgpu::ShaderModuleDescriptor { label: None, source: wgpu::ShaderSource::Wgsl(Cow::Borrowed(include_str!( - "../../../wgpu-hal/examples/halmark/shader.wgsl" + "../../../../wgpu-hal/examples/halmark/shader.wgsl" ))), }); @@ -238,7 +238,7 @@ impl crate::framework::Example for Example { }); let texture = { - let img_data = include_bytes!("../../../logo.png"); + let img_data = include_bytes!("../../../../logo.png"); let decoder = png::Decoder::new(std::io::Cursor::new(img_data)); let mut reader = decoder.read_info().unwrap(); let mut buf = vec![0; reader.output_buffer_size()]; @@ -440,7 +440,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "bunnymark", - image_path: "/examples/src/bunnymark/screenshot.png", + image_path: "/examples/features/src/bunnymark/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/bunnymark/screenshot.png b/examples/features/src/bunnymark/screenshot.png similarity index 100% rename from examples/src/bunnymark/screenshot.png rename to examples/features/src/bunnymark/screenshot.png diff --git a/examples/src/conservative_raster/README.md b/examples/features/src/conservative_raster/README.md similarity index 100% rename from examples/src/conservative_raster/README.md rename to examples/features/src/conservative_raster/README.md diff --git a/examples/src/conservative_raster/mod.rs b/examples/features/src/conservative_raster/mod.rs similarity index 99% rename from examples/src/conservative_raster/mod.rs rename to examples/features/src/conservative_raster/mod.rs index ca0e9b7110..1db6e09835 100644 --- a/examples/src/conservative_raster/mod.rs +++ b/examples/features/src/conservative_raster/mod.rs @@ -317,7 +317,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "conservative-raster", - image_path: "/examples/src/conservative_raster/screenshot.png", + image_path: "/examples/features/src/conservative_raster/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/conservative_raster/screenshot.png b/examples/features/src/conservative_raster/screenshot.png similarity index 100% rename from examples/src/conservative_raster/screenshot.png rename to examples/features/src/conservative_raster/screenshot.png diff --git a/examples/src/conservative_raster/triangle_and_lines.wgsl b/examples/features/src/conservative_raster/triangle_and_lines.wgsl similarity index 100% rename from examples/src/conservative_raster/triangle_and_lines.wgsl rename to examples/features/src/conservative_raster/triangle_and_lines.wgsl diff --git a/examples/src/conservative_raster/upscale.wgsl b/examples/features/src/conservative_raster/upscale.wgsl similarity index 100% rename from examples/src/conservative_raster/upscale.wgsl rename to examples/features/src/conservative_raster/upscale.wgsl diff --git a/examples/src/cube/README.md b/examples/features/src/cube/README.md similarity index 100% rename from examples/src/cube/README.md rename to examples/features/src/cube/README.md diff --git a/examples/src/cube/mod.rs b/examples/features/src/cube/mod.rs similarity index 99% rename from examples/src/cube/mod.rs rename to examples/features/src/cube/mod.rs index ddeeadc6be..8d0a28ab01 100644 --- a/examples/src/cube/mod.rs +++ b/examples/features/src/cube/mod.rs @@ -383,7 +383,7 @@ pub fn main() { static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "cube", // Generated on 1080ti on Vk/Windows - image_path: "/examples/src/cube/screenshot.png", + image_path: "/examples/features/src/cube/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), @@ -399,7 +399,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest static TEST_LINES: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "cube-lines", // Generated on 1080ti on Vk/Windows - image_path: "/examples/src/cube/screenshot-lines.png", + image_path: "/examples/features/src/cube/screenshot-lines.png", width: 1024, height: 768, optional_features: wgpu::Features::POLYGON_MODE_LINE, diff --git a/examples/src/cube/screenshot-lines.png b/examples/features/src/cube/screenshot-lines.png similarity index 100% rename from examples/src/cube/screenshot-lines.png rename to examples/features/src/cube/screenshot-lines.png diff --git a/examples/src/cube/screenshot.png b/examples/features/src/cube/screenshot.png similarity index 100% rename from examples/src/cube/screenshot.png rename to examples/features/src/cube/screenshot.png diff --git a/examples/src/cube/shader.wgsl b/examples/features/src/cube/shader.wgsl similarity index 100% rename from examples/src/cube/shader.wgsl rename to examples/features/src/cube/shader.wgsl diff --git a/examples/src/framework.rs b/examples/features/src/framework.rs similarity index 99% rename from examples/src/framework.rs rename to examples/features/src/framework.rs index db863526d7..927a5fe122 100644 --- a/examples/src/framework.rs +++ b/examples/features/src/framework.rs @@ -597,7 +597,7 @@ impl From> let bytes = dst_buffer_slice.get_mapped_range().to_vec(); wgpu_test::image::compare_image_output( - dbg!(env!("CARGO_MANIFEST_DIR").to_string() + "/../" + params.image_path), + dbg!(env!("CARGO_MANIFEST_DIR").to_string() + "/../../" + params.image_path), &ctx.adapter_info, params.width, params.height, diff --git a/examples/src/hello/README.md b/examples/features/src/hello/README.md similarity index 100% rename from examples/src/hello/README.md rename to examples/features/src/hello/README.md diff --git a/examples/src/hello/mod.rs b/examples/features/src/hello/mod.rs similarity index 100% rename from examples/src/hello/mod.rs rename to examples/features/src/hello/mod.rs diff --git a/examples/src/hello_compute/README.md b/examples/features/src/hello_compute/README.md similarity index 100% rename from examples/src/hello_compute/README.md rename to examples/features/src/hello_compute/README.md diff --git a/examples/src/hello_compute/mod.rs b/examples/features/src/hello_compute/mod.rs similarity index 100% rename from examples/src/hello_compute/mod.rs rename to examples/features/src/hello_compute/mod.rs diff --git a/examples/src/hello_compute/shader.wgsl b/examples/features/src/hello_compute/shader.wgsl similarity index 100% rename from examples/src/hello_compute/shader.wgsl rename to examples/features/src/hello_compute/shader.wgsl diff --git a/examples/src/hello_compute/tests.rs b/examples/features/src/hello_compute/tests.rs similarity index 100% rename from examples/src/hello_compute/tests.rs rename to examples/features/src/hello_compute/tests.rs diff --git a/examples/src/hello_synchronization/README.md b/examples/features/src/hello_synchronization/README.md similarity index 100% rename from examples/src/hello_synchronization/README.md rename to examples/features/src/hello_synchronization/README.md diff --git a/examples/src/hello_synchronization/mod.rs b/examples/features/src/hello_synchronization/mod.rs similarity index 100% rename from examples/src/hello_synchronization/mod.rs rename to examples/features/src/hello_synchronization/mod.rs diff --git a/examples/src/hello_synchronization/shaders.wgsl b/examples/features/src/hello_synchronization/shaders.wgsl similarity index 100% rename from examples/src/hello_synchronization/shaders.wgsl rename to examples/features/src/hello_synchronization/shaders.wgsl diff --git a/examples/src/hello_synchronization/tests.rs b/examples/features/src/hello_synchronization/tests.rs similarity index 100% rename from examples/src/hello_synchronization/tests.rs rename to examples/features/src/hello_synchronization/tests.rs diff --git a/examples/src/hello_triangle/README.md b/examples/features/src/hello_triangle/README.md similarity index 100% rename from examples/src/hello_triangle/README.md rename to examples/features/src/hello_triangle/README.md diff --git a/examples/src/hello_triangle/mod.rs b/examples/features/src/hello_triangle/mod.rs similarity index 100% rename from examples/src/hello_triangle/mod.rs rename to examples/features/src/hello_triangle/mod.rs diff --git a/examples/src/hello_triangle/screenshot.png b/examples/features/src/hello_triangle/screenshot.png similarity index 100% rename from examples/src/hello_triangle/screenshot.png rename to examples/features/src/hello_triangle/screenshot.png diff --git a/examples/src/hello_triangle/shader.wgsl b/examples/features/src/hello_triangle/shader.wgsl similarity index 100% rename from examples/src/hello_triangle/shader.wgsl rename to examples/features/src/hello_triangle/shader.wgsl diff --git a/examples/src/hello_windows/README.md b/examples/features/src/hello_windows/README.md similarity index 100% rename from examples/src/hello_windows/README.md rename to examples/features/src/hello_windows/README.md diff --git a/examples/src/hello_windows/mod.rs b/examples/features/src/hello_windows/mod.rs similarity index 100% rename from examples/src/hello_windows/mod.rs rename to examples/features/src/hello_windows/mod.rs diff --git a/examples/src/hello_windows/screenshot.png b/examples/features/src/hello_windows/screenshot.png similarity index 100% rename from examples/src/hello_windows/screenshot.png rename to examples/features/src/hello_windows/screenshot.png diff --git a/examples/src/hello_workgroups/README.md b/examples/features/src/hello_workgroups/README.md similarity index 100% rename from examples/src/hello_workgroups/README.md rename to examples/features/src/hello_workgroups/README.md diff --git a/examples/src/hello_workgroups/mod.rs b/examples/features/src/hello_workgroups/mod.rs similarity index 100% rename from examples/src/hello_workgroups/mod.rs rename to examples/features/src/hello_workgroups/mod.rs diff --git a/examples/src/hello_workgroups/shader.wgsl b/examples/features/src/hello_workgroups/shader.wgsl similarity index 100% rename from examples/src/hello_workgroups/shader.wgsl rename to examples/features/src/hello_workgroups/shader.wgsl diff --git a/examples/src/lib.rs b/examples/features/src/lib.rs similarity index 100% rename from examples/src/lib.rs rename to examples/features/src/lib.rs diff --git a/examples/src/main.rs b/examples/features/src/main.rs similarity index 100% rename from examples/src/main.rs rename to examples/features/src/main.rs diff --git a/examples/src/mipmap/README.md b/examples/features/src/mipmap/README.md similarity index 100% rename from examples/src/mipmap/README.md rename to examples/features/src/mipmap/README.md diff --git a/examples/src/mipmap/blit.wgsl b/examples/features/src/mipmap/blit.wgsl similarity index 100% rename from examples/src/mipmap/blit.wgsl rename to examples/features/src/mipmap/blit.wgsl diff --git a/examples/src/mipmap/draw.wgsl b/examples/features/src/mipmap/draw.wgsl similarity index 100% rename from examples/src/mipmap/draw.wgsl rename to examples/features/src/mipmap/draw.wgsl diff --git a/examples/src/mipmap/mod.rs b/examples/features/src/mipmap/mod.rs similarity index 99% rename from examples/src/mipmap/mod.rs rename to examples/features/src/mipmap/mod.rs index d4d510eb06..8d50fc27a6 100644 --- a/examples/src/mipmap/mod.rs +++ b/examples/features/src/mipmap/mod.rs @@ -508,7 +508,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "mipmap", - image_path: "/examples/src/mipmap/screenshot.png", + image_path: "/examples/features/src/mipmap/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), @@ -521,7 +521,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest #[wgpu_test::gpu_test] static TEST_QUERY: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "mipmap-query", - image_path: "/examples/src/mipmap/screenshot_query.png", + image_path: "/examples/features/src/mipmap/screenshot_query.png", width: 1024, height: 768, optional_features: QUERY_FEATURES, diff --git a/examples/src/mipmap/screenshot-query.png b/examples/features/src/mipmap/screenshot-query.png similarity index 100% rename from examples/src/mipmap/screenshot-query.png rename to examples/features/src/mipmap/screenshot-query.png diff --git a/examples/src/mipmap/screenshot.png b/examples/features/src/mipmap/screenshot.png similarity index 100% rename from examples/src/mipmap/screenshot.png rename to examples/features/src/mipmap/screenshot.png diff --git a/examples/src/mipmap/screenshot_query.png b/examples/features/src/mipmap/screenshot_query.png similarity index 100% rename from examples/src/mipmap/screenshot_query.png rename to examples/features/src/mipmap/screenshot_query.png diff --git a/examples/src/msaa_line/README.md b/examples/features/src/msaa_line/README.md similarity index 100% rename from examples/src/msaa_line/README.md rename to examples/features/src/msaa_line/README.md diff --git a/examples/src/msaa_line/mod.rs b/examples/features/src/msaa_line/mod.rs similarity index 99% rename from examples/src/msaa_line/mod.rs rename to examples/features/src/msaa_line/mod.rs index be9dc74f7a..f956235cc7 100644 --- a/examples/src/msaa_line/mod.rs +++ b/examples/features/src/msaa_line/mod.rs @@ -321,7 +321,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "msaa-line", - image_path: "/examples/src/msaa_line/screenshot.png", + image_path: "/examples/features/src/msaa_line/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::TEXTURE_ADAPTER_SPECIFIC_FORMAT_FEATURES, diff --git a/examples/src/msaa_line/screenshot.png b/examples/features/src/msaa_line/screenshot.png similarity index 100% rename from examples/src/msaa_line/screenshot.png rename to examples/features/src/msaa_line/screenshot.png diff --git a/examples/src/msaa_line/shader.wgsl b/examples/features/src/msaa_line/shader.wgsl similarity index 100% rename from examples/src/msaa_line/shader.wgsl rename to examples/features/src/msaa_line/shader.wgsl diff --git a/examples/src/multiple_render_targets/README.md b/examples/features/src/multiple_render_targets/README.md similarity index 100% rename from examples/src/multiple_render_targets/README.md rename to examples/features/src/multiple_render_targets/README.md diff --git a/examples/src/multiple_render_targets/mod.rs b/examples/features/src/multiple_render_targets/mod.rs similarity index 99% rename from examples/src/multiple_render_targets/mod.rs rename to examples/features/src/multiple_render_targets/mod.rs index c7301024b5..37991354b4 100644 --- a/examples/src/multiple_render_targets/mod.rs +++ b/examples/features/src/multiple_render_targets/mod.rs @@ -534,7 +534,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: EXAMPLE_NAME, - image_path: "/examples/src/multiple_render_targets/screenshot.png", + image_path: "/examples/features/src/multiple_render_targets/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/multiple_render_targets/screenshot.png b/examples/features/src/multiple_render_targets/screenshot.png similarity index 100% rename from examples/src/multiple_render_targets/screenshot.png rename to examples/features/src/multiple_render_targets/screenshot.png diff --git a/examples/src/multiple_render_targets/shader.wgsl b/examples/features/src/multiple_render_targets/shader.wgsl similarity index 100% rename from examples/src/multiple_render_targets/shader.wgsl rename to examples/features/src/multiple_render_targets/shader.wgsl diff --git a/examples/src/ray_cube_compute/README.md b/examples/features/src/ray_cube_compute/README.md similarity index 100% rename from examples/src/ray_cube_compute/README.md rename to examples/features/src/ray_cube_compute/README.md diff --git a/examples/src/ray_cube_compute/blit.wgsl b/examples/features/src/ray_cube_compute/blit.wgsl similarity index 100% rename from examples/src/ray_cube_compute/blit.wgsl rename to examples/features/src/ray_cube_compute/blit.wgsl diff --git a/examples/src/ray_cube_compute/mod.rs b/examples/features/src/ray_cube_compute/mod.rs similarity index 99% rename from examples/src/ray_cube_compute/mod.rs rename to examples/features/src/ray_cube_compute/mod.rs index 743ca17650..ec7864c1fb 100644 --- a/examples/src/ray_cube_compute/mod.rs +++ b/examples/features/src/ray_cube_compute/mod.rs @@ -486,7 +486,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "ray_cube_compute", - image_path: "/examples/src/ray_cube_compute/screenshot.png", + image_path: "/examples/features/src/ray_cube_compute/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/ray_cube_compute/screenshot.png b/examples/features/src/ray_cube_compute/screenshot.png similarity index 100% rename from examples/src/ray_cube_compute/screenshot.png rename to examples/features/src/ray_cube_compute/screenshot.png diff --git a/examples/src/ray_cube_compute/shader.wgsl b/examples/features/src/ray_cube_compute/shader.wgsl similarity index 100% rename from examples/src/ray_cube_compute/shader.wgsl rename to examples/features/src/ray_cube_compute/shader.wgsl diff --git a/examples/src/ray_cube_fragment/README.md b/examples/features/src/ray_cube_fragment/README.md similarity index 100% rename from examples/src/ray_cube_fragment/README.md rename to examples/features/src/ray_cube_fragment/README.md diff --git a/examples/src/ray_cube_fragment/mod.rs b/examples/features/src/ray_cube_fragment/mod.rs similarity index 99% rename from examples/src/ray_cube_fragment/mod.rs rename to examples/features/src/ray_cube_fragment/mod.rs index 9ebf36fb32..05cfa41d33 100644 --- a/examples/src/ray_cube_fragment/mod.rs +++ b/examples/features/src/ray_cube_fragment/mod.rs @@ -373,7 +373,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "ray_cube_fragment", - image_path: "/examples/src/ray_cube_fragment/screenshot.png", + image_path: "/examples/features/src/ray_cube_fragment/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/ray_cube_fragment/screenshot.png b/examples/features/src/ray_cube_fragment/screenshot.png similarity index 100% rename from examples/src/ray_cube_fragment/screenshot.png rename to examples/features/src/ray_cube_fragment/screenshot.png diff --git a/examples/src/ray_cube_fragment/shader.wgsl b/examples/features/src/ray_cube_fragment/shader.wgsl similarity index 100% rename from examples/src/ray_cube_fragment/shader.wgsl rename to examples/features/src/ray_cube_fragment/shader.wgsl diff --git a/examples/src/ray_scene/cube.mtl b/examples/features/src/ray_scene/cube.mtl similarity index 100% rename from examples/src/ray_scene/cube.mtl rename to examples/features/src/ray_scene/cube.mtl diff --git a/examples/src/ray_scene/cube.obj b/examples/features/src/ray_scene/cube.obj similarity index 100% rename from examples/src/ray_scene/cube.obj rename to examples/features/src/ray_scene/cube.obj diff --git a/examples/src/ray_scene/mod.rs b/examples/features/src/ray_scene/mod.rs similarity index 99% rename from examples/src/ray_scene/mod.rs rename to examples/features/src/ray_scene/mod.rs index 1d681b064e..7acf13a855 100644 --- a/examples/src/ray_scene/mod.rs +++ b/examples/features/src/ray_scene/mod.rs @@ -551,7 +551,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "ray_scene", - image_path: "/examples/src/ray_scene/screenshot.png", + image_path: "/examples/features/src/ray_scene/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/ray_scene/screenshot.png b/examples/features/src/ray_scene/screenshot.png similarity index 100% rename from examples/src/ray_scene/screenshot.png rename to examples/features/src/ray_scene/screenshot.png diff --git a/examples/src/ray_scene/shader.wgsl b/examples/features/src/ray_scene/shader.wgsl similarity index 100% rename from examples/src/ray_scene/shader.wgsl rename to examples/features/src/ray_scene/shader.wgsl diff --git a/examples/src/ray_shadows/README.md b/examples/features/src/ray_shadows/README.md similarity index 100% rename from examples/src/ray_shadows/README.md rename to examples/features/src/ray_shadows/README.md diff --git a/examples/src/ray_shadows/mod.rs b/examples/features/src/ray_shadows/mod.rs similarity index 99% rename from examples/src/ray_shadows/mod.rs rename to examples/features/src/ray_shadows/mod.rs index d605662283..4b416251a2 100644 --- a/examples/src/ray_shadows/mod.rs +++ b/examples/features/src/ray_shadows/mod.rs @@ -367,7 +367,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "ray_cube_shadows", - image_path: "/examples/src/ray_shadows/screenshot.png", + image_path: "/examples/features/src/ray_shadows/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/ray_shadows/screenshot.png b/examples/features/src/ray_shadows/screenshot.png similarity index 100% rename from examples/src/ray_shadows/screenshot.png rename to examples/features/src/ray_shadows/screenshot.png diff --git a/examples/src/ray_shadows/shader.wgsl b/examples/features/src/ray_shadows/shader.wgsl similarity index 100% rename from examples/src/ray_shadows/shader.wgsl rename to examples/features/src/ray_shadows/shader.wgsl diff --git a/examples/src/ray_traced_triangle/README.md b/examples/features/src/ray_traced_triangle/README.md similarity index 100% rename from examples/src/ray_traced_triangle/README.md rename to examples/features/src/ray_traced_triangle/README.md diff --git a/examples/src/ray_traced_triangle/blit.wgsl b/examples/features/src/ray_traced_triangle/blit.wgsl similarity index 100% rename from examples/src/ray_traced_triangle/blit.wgsl rename to examples/features/src/ray_traced_triangle/blit.wgsl diff --git a/examples/src/ray_traced_triangle/mod.rs b/examples/features/src/ray_traced_triangle/mod.rs similarity index 99% rename from examples/src/ray_traced_triangle/mod.rs rename to examples/features/src/ray_traced_triangle/mod.rs index 900aafea81..695a7158c2 100644 --- a/examples/src/ray_traced_triangle/mod.rs +++ b/examples/features/src/ray_traced_triangle/mod.rs @@ -425,7 +425,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "ray_traced_triangle", - image_path: "/examples/src/ray_traced_triangle/screenshot.png", + image_path: "/examples/features/src/ray_traced_triangle/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/ray_traced_triangle/screenshot.png b/examples/features/src/ray_traced_triangle/screenshot.png similarity index 100% rename from examples/src/ray_traced_triangle/screenshot.png rename to examples/features/src/ray_traced_triangle/screenshot.png diff --git a/examples/src/ray_traced_triangle/shader.wgsl b/examples/features/src/ray_traced_triangle/shader.wgsl similarity index 100% rename from examples/src/ray_traced_triangle/shader.wgsl rename to examples/features/src/ray_traced_triangle/shader.wgsl diff --git a/examples/src/render_to_texture/README.md b/examples/features/src/render_to_texture/README.md similarity index 100% rename from examples/src/render_to_texture/README.md rename to examples/features/src/render_to_texture/README.md diff --git a/examples/src/render_to_texture/mod.rs b/examples/features/src/render_to_texture/mod.rs similarity index 100% rename from examples/src/render_to_texture/mod.rs rename to examples/features/src/render_to_texture/mod.rs diff --git a/examples/src/render_to_texture/shader.wgsl b/examples/features/src/render_to_texture/shader.wgsl similarity index 100% rename from examples/src/render_to_texture/shader.wgsl rename to examples/features/src/render_to_texture/shader.wgsl diff --git a/examples/src/repeated_compute/README.md b/examples/features/src/repeated_compute/README.md similarity index 100% rename from examples/src/repeated_compute/README.md rename to examples/features/src/repeated_compute/README.md diff --git a/examples/src/repeated_compute/mod.rs b/examples/features/src/repeated_compute/mod.rs similarity index 100% rename from examples/src/repeated_compute/mod.rs rename to examples/features/src/repeated_compute/mod.rs diff --git a/examples/src/repeated_compute/shader.wgsl b/examples/features/src/repeated_compute/shader.wgsl similarity index 100% rename from examples/src/repeated_compute/shader.wgsl rename to examples/features/src/repeated_compute/shader.wgsl diff --git a/examples/src/shadow/README.md b/examples/features/src/shadow/README.md similarity index 100% rename from examples/src/shadow/README.md rename to examples/features/src/shadow/README.md diff --git a/examples/src/shadow/mod.rs b/examples/features/src/shadow/mod.rs similarity index 99% rename from examples/src/shadow/mod.rs rename to examples/features/src/shadow/mod.rs index 842f831210..7358b0b92c 100644 --- a/examples/src/shadow/mod.rs +++ b/examples/features/src/shadow/mod.rs @@ -844,7 +844,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "shadow", - image_path: "/examples/src/shadow/screenshot.png", + image_path: "/examples/features/src/shadow/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/shadow/screenshot.png b/examples/features/src/shadow/screenshot.png similarity index 100% rename from examples/src/shadow/screenshot.png rename to examples/features/src/shadow/screenshot.png diff --git a/examples/src/shadow/shader.wgsl b/examples/features/src/shadow/shader.wgsl similarity index 100% rename from examples/src/shadow/shader.wgsl rename to examples/features/src/shadow/shader.wgsl diff --git a/examples/src/skybox/README.md b/examples/features/src/skybox/README.md similarity index 100% rename from examples/src/skybox/README.md rename to examples/features/src/skybox/README.md diff --git a/examples/src/skybox/images/astc.ktx2 b/examples/features/src/skybox/images/astc.ktx2 similarity index 100% rename from examples/src/skybox/images/astc.ktx2 rename to examples/features/src/skybox/images/astc.ktx2 diff --git a/examples/src/skybox/images/bc7.ktx2 b/examples/features/src/skybox/images/bc7.ktx2 similarity index 100% rename from examples/src/skybox/images/bc7.ktx2 rename to examples/features/src/skybox/images/bc7.ktx2 diff --git a/examples/src/skybox/images/etc2.ktx2 b/examples/features/src/skybox/images/etc2.ktx2 similarity index 100% rename from examples/src/skybox/images/etc2.ktx2 rename to examples/features/src/skybox/images/etc2.ktx2 diff --git a/examples/src/skybox/images/generation.bash b/examples/features/src/skybox/images/generation.bash similarity index 100% rename from examples/src/skybox/images/generation.bash rename to examples/features/src/skybox/images/generation.bash diff --git a/examples/src/skybox/images/rgba8.ktx2 b/examples/features/src/skybox/images/rgba8.ktx2 similarity index 100% rename from examples/src/skybox/images/rgba8.ktx2 rename to examples/features/src/skybox/images/rgba8.ktx2 diff --git a/examples/src/skybox/mod.rs b/examples/features/src/skybox/mod.rs similarity index 98% rename from examples/src/skybox/mod.rs rename to examples/features/src/skybox/mod.rs index 16c6eb4b4b..d9ec1c6f0e 100644 --- a/examples/src/skybox/mod.rs +++ b/examples/features/src/skybox/mod.rs @@ -474,7 +474,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "skybox", - image_path: "/examples/src/skybox/screenshot.png", + image_path: "/examples/features/src/skybox/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), @@ -489,7 +489,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest #[wgpu_test::gpu_test] static TEST_BCN: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "skybox-bc7", - image_path: "/examples/src/skybox/screenshot_bc7.png", + image_path: "/examples/features/src/skybox/screenshot_bc7.png", width: 1024, height: 768, optional_features: wgpu::Features::TEXTURE_COMPRESSION_BC, @@ -502,7 +502,7 @@ static TEST_BCN: crate::framework::ExampleTestParams = crate::framework::Example #[wgpu_test::gpu_test] static TEST_ETC2: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "skybox-etc2", - image_path: "/examples/src/skybox/screenshot_etc2.png", + image_path: "/examples/features/src/skybox/screenshot_etc2.png", width: 1024, height: 768, optional_features: wgpu::Features::TEXTURE_COMPRESSION_ETC2, @@ -515,7 +515,7 @@ static TEST_ETC2: crate::framework::ExampleTestParams = crate::framework::Exampl #[wgpu_test::gpu_test] static TEST_ASTC: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "skybox-astc", - image_path: "/examples/src/skybox/screenshot_astc.png", + image_path: "/examples/features/src/skybox/screenshot_astc.png", width: 1024, height: 768, optional_features: wgpu::Features::TEXTURE_COMPRESSION_ASTC, diff --git a/examples/src/skybox/models/teslacyberv3.0.mtl b/examples/features/src/skybox/models/teslacyberv3.0.mtl similarity index 100% rename from examples/src/skybox/models/teslacyberv3.0.mtl rename to examples/features/src/skybox/models/teslacyberv3.0.mtl diff --git a/examples/src/skybox/models/teslacyberv3.0.obj b/examples/features/src/skybox/models/teslacyberv3.0.obj similarity index 100% rename from examples/src/skybox/models/teslacyberv3.0.obj rename to examples/features/src/skybox/models/teslacyberv3.0.obj diff --git a/examples/src/skybox/screenshot.png b/examples/features/src/skybox/screenshot.png similarity index 100% rename from examples/src/skybox/screenshot.png rename to examples/features/src/skybox/screenshot.png diff --git a/examples/src/skybox/screenshot_astc.png b/examples/features/src/skybox/screenshot_astc.png similarity index 100% rename from examples/src/skybox/screenshot_astc.png rename to examples/features/src/skybox/screenshot_astc.png diff --git a/examples/src/skybox/screenshot_bc7.png b/examples/features/src/skybox/screenshot_bc7.png similarity index 100% rename from examples/src/skybox/screenshot_bc7.png rename to examples/features/src/skybox/screenshot_bc7.png diff --git a/examples/src/skybox/screenshot_etc2.png b/examples/features/src/skybox/screenshot_etc2.png similarity index 100% rename from examples/src/skybox/screenshot_etc2.png rename to examples/features/src/skybox/screenshot_etc2.png diff --git a/examples/src/skybox/shader.wgsl b/examples/features/src/skybox/shader.wgsl similarity index 100% rename from examples/src/skybox/shader.wgsl rename to examples/features/src/skybox/shader.wgsl diff --git a/examples/src/srgb_blend/README.md b/examples/features/src/srgb_blend/README.md similarity index 100% rename from examples/src/srgb_blend/README.md rename to examples/features/src/srgb_blend/README.md diff --git a/examples/src/srgb_blend/mod.rs b/examples/features/src/srgb_blend/mod.rs similarity index 98% rename from examples/src/srgb_blend/mod.rs rename to examples/features/src/srgb_blend/mod.rs index d56cea7bce..8471b3cc5c 100644 --- a/examples/src/srgb_blend/mod.rs +++ b/examples/features/src/srgb_blend/mod.rs @@ -225,7 +225,7 @@ pub fn main() { static TEST_SRGB: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "srgb-blend-srg", // Generated on WARP/Windows - image_path: "/examples/src/srgb_blend/screenshot-srgb.png", + image_path: "/examples/features/src/srgb_blend/screenshot-srgb.png", width: 192, height: 192, optional_features: wgpu::Features::default(), @@ -239,7 +239,7 @@ static TEST_SRGB: crate::framework::ExampleTestParams = crate::framework::Exampl static TEST_LINEAR: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "srgb-blend-linear", // Generated on WARP/Windows - image_path: "/examples/src/srgb_blend/screenshot-linear.png", + image_path: "/examples/features/src/srgb_blend/screenshot-linear.png", width: 192, height: 192, optional_features: wgpu::Features::default(), diff --git a/examples/src/srgb_blend/screenshot-linear.png b/examples/features/src/srgb_blend/screenshot-linear.png similarity index 100% rename from examples/src/srgb_blend/screenshot-linear.png rename to examples/features/src/srgb_blend/screenshot-linear.png diff --git a/examples/src/srgb_blend/screenshot-srgb.png b/examples/features/src/srgb_blend/screenshot-srgb.png similarity index 100% rename from examples/src/srgb_blend/screenshot-srgb.png rename to examples/features/src/srgb_blend/screenshot-srgb.png diff --git a/examples/src/srgb_blend/shader.wgsl b/examples/features/src/srgb_blend/shader.wgsl similarity index 100% rename from examples/src/srgb_blend/shader.wgsl rename to examples/features/src/srgb_blend/shader.wgsl diff --git a/examples/src/stencil_triangles/README.md b/examples/features/src/stencil_triangles/README.md similarity index 100% rename from examples/src/stencil_triangles/README.md rename to examples/features/src/stencil_triangles/README.md diff --git a/examples/src/stencil_triangles/mod.rs b/examples/features/src/stencil_triangles/mod.rs similarity index 99% rename from examples/src/stencil_triangles/mod.rs rename to examples/features/src/stencil_triangles/mod.rs index 761a9ef602..b03aedd5ec 100644 --- a/examples/src/stencil_triangles/mod.rs +++ b/examples/features/src/stencil_triangles/mod.rs @@ -246,7 +246,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "stencil-triangles", - image_path: "/examples/src/stencil_triangles/screenshot.png", + image_path: "/examples/features/src/stencil_triangles/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/stencil_triangles/screenshot.png b/examples/features/src/stencil_triangles/screenshot.png similarity index 100% rename from examples/src/stencil_triangles/screenshot.png rename to examples/features/src/stencil_triangles/screenshot.png diff --git a/examples/src/stencil_triangles/shader.wgsl b/examples/features/src/stencil_triangles/shader.wgsl similarity index 100% rename from examples/src/stencil_triangles/shader.wgsl rename to examples/features/src/stencil_triangles/shader.wgsl diff --git a/examples/src/storage_texture/README.md b/examples/features/src/storage_texture/README.md similarity index 100% rename from examples/src/storage_texture/README.md rename to examples/features/src/storage_texture/README.md diff --git a/examples/src/storage_texture/example.png b/examples/features/src/storage_texture/example.png similarity index 100% rename from examples/src/storage_texture/example.png rename to examples/features/src/storage_texture/example.png diff --git a/examples/src/storage_texture/mod.rs b/examples/features/src/storage_texture/mod.rs similarity index 100% rename from examples/src/storage_texture/mod.rs rename to examples/features/src/storage_texture/mod.rs diff --git a/examples/src/storage_texture/shader.wgsl b/examples/features/src/storage_texture/shader.wgsl similarity index 100% rename from examples/src/storage_texture/shader.wgsl rename to examples/features/src/storage_texture/shader.wgsl diff --git a/examples/src/texture_arrays/README.md b/examples/features/src/texture_arrays/README.md similarity index 100% rename from examples/src/texture_arrays/README.md rename to examples/features/src/texture_arrays/README.md diff --git a/examples/src/texture_arrays/indexing.wgsl b/examples/features/src/texture_arrays/indexing.wgsl similarity index 100% rename from examples/src/texture_arrays/indexing.wgsl rename to examples/features/src/texture_arrays/indexing.wgsl diff --git a/examples/src/texture_arrays/mod.rs b/examples/features/src/texture_arrays/mod.rs similarity index 98% rename from examples/src/texture_arrays/mod.rs rename to examples/features/src/texture_arrays/mod.rs index 7cac05c384..1f28ca53b2 100644 --- a/examples/src/texture_arrays/mod.rs +++ b/examples/features/src/texture_arrays/mod.rs @@ -411,7 +411,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "texture-arrays", - image_path: "/examples/src/texture_arrays/screenshot.png", + image_path: "/examples/features/src/texture_arrays/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::empty(), @@ -424,7 +424,7 @@ static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTest #[wgpu_test::gpu_test] static TEST_UNIFORM: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "texture-arrays-uniform", - image_path: "/examples/src/texture_arrays/screenshot.png", + image_path: "/examples/features/src/texture_arrays/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::empty(), @@ -438,7 +438,7 @@ static TEST_UNIFORM: crate::framework::ExampleTestParams = crate::framework::Exa static TEST_NON_UNIFORM: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "texture-arrays-non-uniform", - image_path: "/examples/src/texture_arrays/screenshot.png", + image_path: "/examples/features/src/texture_arrays/screenshot.png", width: 1024, height: 768, optional_features: diff --git a/examples/src/texture_arrays/non_uniform_indexing.wgsl b/examples/features/src/texture_arrays/non_uniform_indexing.wgsl similarity index 100% rename from examples/src/texture_arrays/non_uniform_indexing.wgsl rename to examples/features/src/texture_arrays/non_uniform_indexing.wgsl diff --git a/examples/src/texture_arrays/screenshot.png b/examples/features/src/texture_arrays/screenshot.png similarity index 100% rename from examples/src/texture_arrays/screenshot.png rename to examples/features/src/texture_arrays/screenshot.png diff --git a/examples/src/timestamp_queries/README.md b/examples/features/src/timestamp_queries/README.md similarity index 100% rename from examples/src/timestamp_queries/README.md rename to examples/features/src/timestamp_queries/README.md diff --git a/examples/src/timestamp_queries/mod.rs b/examples/features/src/timestamp_queries/mod.rs similarity index 100% rename from examples/src/timestamp_queries/mod.rs rename to examples/features/src/timestamp_queries/mod.rs diff --git a/examples/src/timestamp_queries/shader.wgsl b/examples/features/src/timestamp_queries/shader.wgsl similarity index 100% rename from examples/src/timestamp_queries/shader.wgsl rename to examples/features/src/timestamp_queries/shader.wgsl diff --git a/examples/src/uniform_values/README.md b/examples/features/src/uniform_values/README.md similarity index 100% rename from examples/src/uniform_values/README.md rename to examples/features/src/uniform_values/README.md diff --git a/examples/src/uniform_values/mod.rs b/examples/features/src/uniform_values/mod.rs similarity index 100% rename from examples/src/uniform_values/mod.rs rename to examples/features/src/uniform_values/mod.rs diff --git a/examples/src/uniform_values/screenshot1.png b/examples/features/src/uniform_values/screenshot1.png similarity index 100% rename from examples/src/uniform_values/screenshot1.png rename to examples/features/src/uniform_values/screenshot1.png diff --git a/examples/src/uniform_values/screenshot2.png b/examples/features/src/uniform_values/screenshot2.png similarity index 100% rename from examples/src/uniform_values/screenshot2.png rename to examples/features/src/uniform_values/screenshot2.png diff --git a/examples/src/uniform_values/screenshot3.png b/examples/features/src/uniform_values/screenshot3.png similarity index 100% rename from examples/src/uniform_values/screenshot3.png rename to examples/features/src/uniform_values/screenshot3.png diff --git a/examples/src/uniform_values/shader.wgsl b/examples/features/src/uniform_values/shader.wgsl similarity index 100% rename from examples/src/uniform_values/shader.wgsl rename to examples/features/src/uniform_values/shader.wgsl diff --git a/examples/src/utils.rs b/examples/features/src/utils.rs similarity index 100% rename from examples/src/utils.rs rename to examples/features/src/utils.rs diff --git a/examples/src/water/README.md b/examples/features/src/water/README.md similarity index 100% rename from examples/src/water/README.md rename to examples/features/src/water/README.md diff --git a/examples/src/water/mod.rs b/examples/features/src/water/mod.rs similarity index 99% rename from examples/src/water/mod.rs rename to examples/features/src/water/mod.rs index b673b711bd..1e4b164020 100644 --- a/examples/src/water/mod.rs +++ b/examples/features/src/water/mod.rs @@ -822,7 +822,7 @@ pub fn main() { #[wgpu_test::gpu_test] static TEST: crate::framework::ExampleTestParams = crate::framework::ExampleTestParams { name: "water", - image_path: "/examples/src/water/screenshot.png", + image_path: "/examples/features/src/water/screenshot.png", width: 1024, height: 768, optional_features: wgpu::Features::default(), diff --git a/examples/src/water/point_gen.rs b/examples/features/src/water/point_gen.rs similarity index 100% rename from examples/src/water/point_gen.rs rename to examples/features/src/water/point_gen.rs diff --git a/examples/src/water/screenshot.png b/examples/features/src/water/screenshot.png similarity index 100% rename from examples/src/water/screenshot.png rename to examples/features/src/water/screenshot.png diff --git a/examples/src/water/terrain.wgsl b/examples/features/src/water/terrain.wgsl similarity index 100% rename from examples/src/water/terrain.wgsl rename to examples/features/src/water/terrain.wgsl diff --git a/examples/src/water/water.wgsl b/examples/features/src/water/water.wgsl similarity index 100% rename from examples/src/water/water.wgsl rename to examples/features/src/water/water.wgsl diff --git a/examples/static/index.html b/examples/features/web-static/index.html similarity index 100% rename from examples/static/index.html rename to examples/features/web-static/index.html diff --git a/xtask/src/run_wasm.rs b/xtask/src/run_wasm.rs index a9e8e3c9d0..d71d88722f 100644 --- a/xtask/src/run_wasm.rs +++ b/xtask/src/run_wasm.rs @@ -77,7 +77,7 @@ pub(crate) fn run_wasm(shell: Shell, mut args: Arguments) -> anyhow::Result<()> .context("Failed to run wasm-bindgen")?; let static_files = shell - .read_dir("examples/static") + .read_dir("examples/features/web-static") .context("Failed to enumerate static files")?; for file in static_files {