From 922b8d53380073ec91d027171a98c342c6bb7b41 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Sat, 29 Apr 2023 10:54:11 +1000 Subject: [PATCH] Rename kea_renderer_shaders -> kea_renderer_gpu For same reasons as listed in last commit. --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- kea_renderer/Cargo.toml | 2 +- kea_renderer/src/gpu/ray_tracing_pipeline.rs | 8 ++++---- kea_renderer/src/gpu/slots.rs | 2 +- kea_renderer/src/scenes/examples.rs | 2 +- kea_renderer/src/scenes/scene.rs | 18 +++++++++--------- .../.gitignore | 0 .../Cargo.toml | 2 +- .../src/cameras/camera.rs | 0 .../src/cameras/mod.rs | 0 .../src/lib.rs | 0 .../src/lights/mod.rs | 0 .../src/lights/point_light.rs | 0 .../src/materials/material.rs | 0 .../src/materials/mod.rs | 0 .../src/path_tracer/entrypoints.rs | 0 .../src/path_tracer/mod.rs | 0 .../src/path_tracer/rand.rs | 0 .../src/payload.rs | 0 .../src/spheres/entrypoints.rs | 0 .../src/spheres/mod.rs | 0 .../src/spheres/sphere.rs | 0 .../src/triangles/entrypoints.rs | 0 .../src/triangles/mesh.rs | 0 .../src/triangles/mod.rs | 0 26 files changed, 20 insertions(+), 20 deletions(-) rename {kea_renderer_shaders => kea_renderer_gpu}/.gitignore (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/Cargo.toml (70%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/cameras/camera.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/cameras/mod.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/lib.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/lights/mod.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/lights/point_light.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/materials/material.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/materials/mod.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/path_tracer/entrypoints.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/path_tracer/mod.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/path_tracer/rand.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/payload.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/spheres/entrypoints.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/spheres/mod.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/spheres/sphere.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/triangles/entrypoints.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/triangles/mesh.rs (100%) rename {kea_renderer_shaders => kea_renderer_gpu}/src/triangles/mod.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index b73411f..14de5e9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -968,7 +968,7 @@ dependencies = [ "gpu-allocator", "kea_gpu", "kea_gpulib", - "kea_renderer_shaders", + "kea_renderer_gpu", "log", "memoffset 0.8.0", "spirv-std", @@ -976,7 +976,7 @@ dependencies = [ ] [[package]] -name = "kea_renderer_shaders" +name = "kea_renderer_gpu" version = "0.1.0" dependencies = [ "kea_gpulib", diff --git a/Cargo.toml b/Cargo.toml index d619a45..fa005c4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,7 +3,7 @@ members = [ "kea_gpu", "kea_gpulib", "kea_renderer", - "kea_renderer_shaders", + "kea_renderer_gpu", ] [patch.crates-io] diff --git a/kea_renderer/Cargo.toml b/kea_renderer/Cargo.toml index 41b2a46..dd06dd0 100644 --- a/kea_renderer/Cargo.toml +++ b/kea_renderer/Cargo.toml @@ -7,7 +7,7 @@ license = "MIT" [dependencies] kea_gpu = { path = "../kea_gpu" } kea_gpulib = { path = "../kea_gpulib" } -kea_renderer_shaders = { path = "../kea_renderer_shaders" } +kea_renderer_gpu = { path = "../kea_renderer_gpu" } ash = { version = "0.37.2", features = ["linked"] } ash-window = "0.12.0" diff --git a/kea_renderer/src/gpu/ray_tracing_pipeline.rs b/kea_renderer/src/gpu/ray_tracing_pipeline.rs index 52d7a7a..681c41d 100644 --- a/kea_renderer/src/gpu/ray_tracing_pipeline.rs +++ b/kea_renderer/src/gpu/ray_tracing_pipeline.rs @@ -10,7 +10,7 @@ use kea_gpu::{ storage::images::{ImageLayout, ImageView}, Kea, }; -use kea_renderer_shaders::{path_tracer::entrypoints::PushConstants, SlotId}; +use kea_renderer_gpu::{path_tracer::entrypoints::PushConstants, SlotId}; pub struct RayTracingPipeline { pipeline: kea_gpu::ray_tracing::RayTracingPipeline, @@ -20,10 +20,10 @@ pub struct RayTracingPipeline { impl RayTracingPipeline { pub fn new(kea: &Kea, scene: &Scene) -> Self { - let slot_layout = SlotLayout::new(kea_renderer_shaders::SLOTS.to_vec()); + let slot_layout = SlotLayout::new(kea_renderer_gpu::SLOTS.to_vec()); - let shader_groups = ShaderGroups::new(kea_renderer_shaders::SHADERS.to_vec()); - let pipeline_shaders = shader_groups.build(kea.device().clone(), "./kea_renderer_shaders"); + let shader_groups = ShaderGroups::new(kea_renderer_gpu::SHADERS.to_vec()); + let pipeline_shaders = shader_groups.build(kea.device().clone(), "./kea_renderer_gpu"); let pipeline = kea_gpu::ray_tracing::RayTracingPipeline::::new( kea.device().clone(), diff --git a/kea_renderer/src/gpu/slots.rs b/kea_renderer/src/gpu/slots.rs index 9512815..9993e37 100644 --- a/kea_renderer/src/gpu/slots.rs +++ b/kea_renderer/src/gpu/slots.rs @@ -10,7 +10,7 @@ use kea_gpu::{ storage::images::{Image, ImageLayout, ImageView}, Kea, }; -use kea_renderer_shaders::SlotId; +use kea_renderer_gpu::SlotId; use std::sync::Arc; pub fn create_and_bind_slots( diff --git a/kea_renderer/src/scenes/examples.rs b/kea_renderer/src/scenes/examples.rs index ca405d7..cff9879 100644 --- a/kea_renderer/src/scenes/examples.rs +++ b/kea_renderer/src/scenes/examples.rs @@ -1,6 +1,6 @@ use super::Scene; use kea_gpu::device::Device; -use kea_renderer_shaders::materials::Material; +use kea_renderer_gpu::materials::Material; use spirv_std::glam::{vec3, vec3a, Quat, Vec3A}; use std::sync::Arc; diff --git a/kea_renderer/src/scenes/scene.rs b/kea_renderer/src/scenes/scene.rs index 91ba27a..7786ffa 100644 --- a/kea_renderer/src/scenes/scene.rs +++ b/kea_renderer/src/scenes/scene.rs @@ -8,7 +8,7 @@ use kea_gpu::{ storage::buffers::Buffer, }; use kea_gpulib::Aabb; -use kea_renderer_shaders::SlotId; +use kea_renderer_gpu::SlotId; use spirv_std::glam::{vec3a, Affine3A, Quat, Vec3, Vec3A}; use std::sync::Arc; @@ -37,7 +37,7 @@ pub struct Sphere { } #[derive(Component)] -pub struct Material(pub kea_renderer_shaders::materials::Material); +pub struct Material(pub kea_renderer_gpu::materials::Material); #[derive(Component)] pub struct Mesh { @@ -62,7 +62,7 @@ impl Scene { &mut self, position: Vec3, radius: f32, - material: kea_renderer_shaders::materials::Material, + material: kea_renderer_gpu::materials::Material, ) { self.world .spawn((Position(position), Sphere { radius }, Material(material))); @@ -73,7 +73,7 @@ impl Scene { position: Vec3, scale: Vec3, rotation: Quat, - material: kea_renderer_shaders::materials::Material, + material: kea_renderer_gpu::materials::Material, ) { let vertices = vec![ vec3a(0.5, -0.5, 0.5), @@ -115,12 +115,12 @@ impl Scene { "kea renderer scene".to_string(), ); - let spheres: Vec = self + let spheres: Vec = self .world .query::<(&Position, &Sphere, &Material)>() .iter(&self.world) .map(|(position, sphere, material)| { - kea_renderer_shaders::spheres::Sphere::new(position.0, sphere.radius, material.0) + kea_renderer_gpu::spheres::Sphere::new(position.0, sphere.radius, material.0) }) .collect(); @@ -137,7 +137,7 @@ impl Scene { let aabbs: Vec = spheres .iter() - .map(|s: &kea_renderer_shaders::spheres::Sphere| s.aabb()) + .map(|s: &kea_renderer_gpu::spheres::Sphere| s.aabb()) .collect(); log::debug!("Aabbs: {:?}", aabbs); let aabbs_buffer = Buffer::new_from_data( @@ -162,7 +162,7 @@ impl Scene { scene.add_instance(geometry_instance); } - let mut meshes: Vec = vec![]; + let mut meshes: Vec = vec![]; let mut all_vertices: Vec = vec![]; let mut all_indices: Vec<[u32; 3]> = vec![]; @@ -211,7 +211,7 @@ impl Scene { GeometryInstance::new(Arc::new(geometry), 0, transform, meshes.len() as _); scene.add_instance(geometry_instance); - meshes.push(kea_renderer_shaders::triangles::Mesh { + meshes.push(kea_renderer_gpu::triangles::Mesh { // vertices_address, // indices_address, vertices_offset: vertices_offset as _, diff --git a/kea_renderer_shaders/.gitignore b/kea_renderer_gpu/.gitignore similarity index 100% rename from kea_renderer_shaders/.gitignore rename to kea_renderer_gpu/.gitignore diff --git a/kea_renderer_shaders/Cargo.toml b/kea_renderer_gpu/Cargo.toml similarity index 70% rename from kea_renderer_shaders/Cargo.toml rename to kea_renderer_gpu/Cargo.toml index b573554..9bea4d5 100644 --- a/kea_renderer_shaders/Cargo.toml +++ b/kea_renderer_gpu/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kea_renderer_shaders" +name = "kea_renderer_gpu" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/kea_renderer_shaders/src/cameras/camera.rs b/kea_renderer_gpu/src/cameras/camera.rs similarity index 100% rename from kea_renderer_shaders/src/cameras/camera.rs rename to kea_renderer_gpu/src/cameras/camera.rs diff --git a/kea_renderer_shaders/src/cameras/mod.rs b/kea_renderer_gpu/src/cameras/mod.rs similarity index 100% rename from kea_renderer_shaders/src/cameras/mod.rs rename to kea_renderer_gpu/src/cameras/mod.rs diff --git a/kea_renderer_shaders/src/lib.rs b/kea_renderer_gpu/src/lib.rs similarity index 100% rename from kea_renderer_shaders/src/lib.rs rename to kea_renderer_gpu/src/lib.rs diff --git a/kea_renderer_shaders/src/lights/mod.rs b/kea_renderer_gpu/src/lights/mod.rs similarity index 100% rename from kea_renderer_shaders/src/lights/mod.rs rename to kea_renderer_gpu/src/lights/mod.rs diff --git a/kea_renderer_shaders/src/lights/point_light.rs b/kea_renderer_gpu/src/lights/point_light.rs similarity index 100% rename from kea_renderer_shaders/src/lights/point_light.rs rename to kea_renderer_gpu/src/lights/point_light.rs diff --git a/kea_renderer_shaders/src/materials/material.rs b/kea_renderer_gpu/src/materials/material.rs similarity index 100% rename from kea_renderer_shaders/src/materials/material.rs rename to kea_renderer_gpu/src/materials/material.rs diff --git a/kea_renderer_shaders/src/materials/mod.rs b/kea_renderer_gpu/src/materials/mod.rs similarity index 100% rename from kea_renderer_shaders/src/materials/mod.rs rename to kea_renderer_gpu/src/materials/mod.rs diff --git a/kea_renderer_shaders/src/path_tracer/entrypoints.rs b/kea_renderer_gpu/src/path_tracer/entrypoints.rs similarity index 100% rename from kea_renderer_shaders/src/path_tracer/entrypoints.rs rename to kea_renderer_gpu/src/path_tracer/entrypoints.rs diff --git a/kea_renderer_shaders/src/path_tracer/mod.rs b/kea_renderer_gpu/src/path_tracer/mod.rs similarity index 100% rename from kea_renderer_shaders/src/path_tracer/mod.rs rename to kea_renderer_gpu/src/path_tracer/mod.rs diff --git a/kea_renderer_shaders/src/path_tracer/rand.rs b/kea_renderer_gpu/src/path_tracer/rand.rs similarity index 100% rename from kea_renderer_shaders/src/path_tracer/rand.rs rename to kea_renderer_gpu/src/path_tracer/rand.rs diff --git a/kea_renderer_shaders/src/payload.rs b/kea_renderer_gpu/src/payload.rs similarity index 100% rename from kea_renderer_shaders/src/payload.rs rename to kea_renderer_gpu/src/payload.rs diff --git a/kea_renderer_shaders/src/spheres/entrypoints.rs b/kea_renderer_gpu/src/spheres/entrypoints.rs similarity index 100% rename from kea_renderer_shaders/src/spheres/entrypoints.rs rename to kea_renderer_gpu/src/spheres/entrypoints.rs diff --git a/kea_renderer_shaders/src/spheres/mod.rs b/kea_renderer_gpu/src/spheres/mod.rs similarity index 100% rename from kea_renderer_shaders/src/spheres/mod.rs rename to kea_renderer_gpu/src/spheres/mod.rs diff --git a/kea_renderer_shaders/src/spheres/sphere.rs b/kea_renderer_gpu/src/spheres/sphere.rs similarity index 100% rename from kea_renderer_shaders/src/spheres/sphere.rs rename to kea_renderer_gpu/src/spheres/sphere.rs diff --git a/kea_renderer_shaders/src/triangles/entrypoints.rs b/kea_renderer_gpu/src/triangles/entrypoints.rs similarity index 100% rename from kea_renderer_shaders/src/triangles/entrypoints.rs rename to kea_renderer_gpu/src/triangles/entrypoints.rs diff --git a/kea_renderer_shaders/src/triangles/mesh.rs b/kea_renderer_gpu/src/triangles/mesh.rs similarity index 100% rename from kea_renderer_shaders/src/triangles/mesh.rs rename to kea_renderer_gpu/src/triangles/mesh.rs diff --git a/kea_renderer_shaders/src/triangles/mod.rs b/kea_renderer_gpu/src/triangles/mod.rs similarity index 100% rename from kea_renderer_shaders/src/triangles/mod.rs rename to kea_renderer_gpu/src/triangles/mod.rs