From dd78795cffc37ef1b71dc35bf5129eaf1747c071 Mon Sep 17 00:00:00 2001 From: Andrew O'Neil Date: Sat, 29 Apr 2023 10:50:14 +1000 Subject: [PATCH] Rename kea_gpu_shaderlib to kea_gpulib Shorter name, and I want to move away from using shader terminology. --- Cargo.lock | 8 ++++---- Cargo.toml | 2 +- kea_gpu/Cargo.toml | 2 +- kea_gpu/src/ray_tracing/scenes/geometry.rs | 2 +- kea_gpu/src/ray_tracing/shader_binding_table.rs | 2 +- kea_gpu/src/shaders/shader_groups.rs | 2 +- kea_gpu/src/slots/slot_bindings.rs | 2 +- kea_gpu/src/slots/slot_layout.rs | 2 +- {kea_gpu_shaderlib => kea_gpulib}/.gitignore | 0 {kea_gpu_shaderlib => kea_gpulib}/Cargo.toml | 2 +- {kea_gpu_shaderlib => kea_gpulib}/src/lib.rs | 0 {kea_gpu_shaderlib => kea_gpulib}/src/ray.rs | 0 {kea_gpu_shaderlib => kea_gpulib}/src/shaders.rs | 0 {kea_gpu_shaderlib => kea_gpulib}/src/slots/mappings.rs | 0 {kea_gpu_shaderlib => kea_gpulib}/src/slots/mod.rs | 0 {kea_gpu_shaderlib => kea_gpulib}/src/slots/slot.rs | 0 {kea_gpu_shaderlib => kea_gpulib}/src/slots/types.rs | 0 kea_renderer/Cargo.toml | 2 +- kea_renderer/src/scenes/scene.rs | 2 +- kea_renderer_shaders/Cargo.toml | 2 +- kea_renderer_shaders/src/cameras/camera.rs | 2 +- kea_renderer_shaders/src/lib.rs | 2 +- kea_renderer_shaders/src/path_tracer/entrypoints.rs | 2 +- kea_renderer_shaders/src/path_tracer/mod.rs | 2 +- kea_renderer_shaders/src/spheres/entrypoints.rs | 2 +- kea_renderer_shaders/src/spheres/mod.rs | 2 +- kea_renderer_shaders/src/spheres/sphere.rs | 2 +- kea_renderer_shaders/src/triangles/mod.rs | 2 +- 28 files changed, 23 insertions(+), 23 deletions(-) rename {kea_gpu_shaderlib => kea_gpulib}/.gitignore (100%) rename {kea_gpu_shaderlib => kea_gpulib}/Cargo.toml (65%) rename {kea_gpu_shaderlib => kea_gpulib}/src/lib.rs (100%) rename {kea_gpu_shaderlib => kea_gpulib}/src/ray.rs (100%) rename {kea_gpu_shaderlib => kea_gpulib}/src/shaders.rs (100%) rename {kea_gpu_shaderlib => kea_gpulib}/src/slots/mappings.rs (100%) rename {kea_gpu_shaderlib => kea_gpulib}/src/slots/mod.rs (100%) rename {kea_gpu_shaderlib => kea_gpulib}/src/slots/slot.rs (100%) rename {kea_gpu_shaderlib => kea_gpulib}/src/slots/types.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index 213b4b3..b73411f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -939,7 +939,7 @@ dependencies = [ "ash-window", "downcast-rs", "gpu-allocator", - "kea_gpu_shaderlib", + "kea_gpulib", "log", "memoffset 0.8.0", "num-traits", @@ -950,7 +950,7 @@ dependencies = [ ] [[package]] -name = "kea_gpu_shaderlib" +name = "kea_gpulib" version = "0.1.0" dependencies = [ "spirv-std", @@ -967,7 +967,7 @@ dependencies = [ "env_logger", "gpu-allocator", "kea_gpu", - "kea_gpu_shaderlib", + "kea_gpulib", "kea_renderer_shaders", "log", "memoffset 0.8.0", @@ -979,7 +979,7 @@ dependencies = [ name = "kea_renderer_shaders" version = "0.1.0" dependencies = [ - "kea_gpu_shaderlib", + "kea_gpulib", "spirv-std", ] diff --git a/Cargo.toml b/Cargo.toml index 53f65fd..d619a45 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [workspace] members = [ "kea_gpu", - "kea_gpu_shaderlib", + "kea_gpulib", "kea_renderer", "kea_renderer_shaders", ] diff --git a/kea_gpu/Cargo.toml b/kea_gpu/Cargo.toml index e651275..6c6c55a 100644 --- a/kea_gpu/Cargo.toml +++ b/kea_gpu/Cargo.toml @@ -17,4 +17,4 @@ downcast-rs = "1.2.0" spirv-builder = "0.7.0" spirv-std = "0.7.0" -kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" } +kea_gpulib = { path = "../kea_gpulib" } diff --git a/kea_gpu/src/ray_tracing/scenes/geometry.rs b/kea_gpu/src/ray_tracing/scenes/geometry.rs index a4f01cc..72ba9cd 100644 --- a/kea_gpu/src/ray_tracing/scenes/geometry.rs +++ b/kea_gpu/src/ray_tracing/scenes/geometry.rs @@ -2,7 +2,7 @@ use super::{acceleration_structure::AccelerationStructure, scratch_buffer::Scrat use crate::{commands::CommandBuffer, device::Device, storage::buffers::Buffer}; use ash::vk; use gpu_allocator::MemoryLocation; -use kea_gpu_shaderlib::Aabb; +use kea_gpulib::Aabb; use spirv_std::glam::Vec3A; use std::{mem, slice, sync::Arc}; diff --git a/kea_gpu/src/ray_tracing/shader_binding_table.rs b/kea_gpu/src/ray_tracing/shader_binding_table.rs index 48dbc42..9bff6cd 100644 --- a/kea_gpu/src/ray_tracing/shader_binding_table.rs +++ b/kea_gpu/src/ray_tracing/shader_binding_table.rs @@ -5,7 +5,7 @@ use crate::{ storage::{buffers::Buffer, memory}, }; use ash::vk; -use kea_gpu_shaderlib::shaders::ShaderGroup; +use kea_gpulib::shaders::ShaderGroup; use std::{iter, sync::Arc}; pub struct RayTracingShaderBindingTables { diff --git a/kea_gpu/src/shaders/shader_groups.rs b/kea_gpu/src/shaders/shader_groups.rs index acddd90..2793b23 100644 --- a/kea_gpu/src/shaders/shader_groups.rs +++ b/kea_gpu/src/shaders/shader_groups.rs @@ -1,7 +1,7 @@ use super::{ShaderEntryPoint, ShaderModule}; use crate::device::Device; use ash::vk; -use kea_gpu_shaderlib::shaders::{Shader, ShaderGroup}; +use kea_gpulib::shaders::{Shader, ShaderGroup}; use std::{collections::HashMap, ffi::CString, sync::Arc}; pub struct ShaderGroups { diff --git a/kea_gpu/src/slots/slot_bindings.rs b/kea_gpu/src/slots/slot_bindings.rs index 30a6ee6..a29fa2c 100644 --- a/kea_gpu/src/slots/slot_bindings.rs +++ b/kea_gpu/src/slots/slot_bindings.rs @@ -6,7 +6,7 @@ use crate::{ storage::{buffers::Buffer, images::ImageView}, }; use ash::vk; -use kea_gpu_shaderlib::slots::SlotType; +use kea_gpulib::slots::SlotType; use std::{collections::HashMap, hash::Hash, slice, sync::Arc}; pub struct SlotBindings { diff --git a/kea_gpu/src/slots/slot_layout.rs b/kea_gpu/src/slots/slot_layout.rs index 3ada41a..4838191 100644 --- a/kea_gpu/src/slots/slot_layout.rs +++ b/kea_gpu/src/slots/slot_layout.rs @@ -1,6 +1,6 @@ use crate::descriptors::DescriptorSetLayoutBinding; use ash::vk; -use kea_gpu_shaderlib::slots::{Slot, SlotType}; +use kea_gpulib::slots::{Slot, SlotType}; pub struct SlotLayout { slots: Vec<(SlotId, Slot)>, diff --git a/kea_gpu_shaderlib/.gitignore b/kea_gpulib/.gitignore similarity index 100% rename from kea_gpu_shaderlib/.gitignore rename to kea_gpulib/.gitignore diff --git a/kea_gpu_shaderlib/Cargo.toml b/kea_gpulib/Cargo.toml similarity index 65% rename from kea_gpu_shaderlib/Cargo.toml rename to kea_gpulib/Cargo.toml index 623284f..aff6484 100644 --- a/kea_gpu_shaderlib/Cargo.toml +++ b/kea_gpulib/Cargo.toml @@ -1,5 +1,5 @@ [package] -name = "kea_gpu_shaderlib" +name = "kea_gpulib" version = "0.1.0" edition = "2021" license = "MIT" diff --git a/kea_gpu_shaderlib/src/lib.rs b/kea_gpulib/src/lib.rs similarity index 100% rename from kea_gpu_shaderlib/src/lib.rs rename to kea_gpulib/src/lib.rs diff --git a/kea_gpu_shaderlib/src/ray.rs b/kea_gpulib/src/ray.rs similarity index 100% rename from kea_gpu_shaderlib/src/ray.rs rename to kea_gpulib/src/ray.rs diff --git a/kea_gpu_shaderlib/src/shaders.rs b/kea_gpulib/src/shaders.rs similarity index 100% rename from kea_gpu_shaderlib/src/shaders.rs rename to kea_gpulib/src/shaders.rs diff --git a/kea_gpu_shaderlib/src/slots/mappings.rs b/kea_gpulib/src/slots/mappings.rs similarity index 100% rename from kea_gpu_shaderlib/src/slots/mappings.rs rename to kea_gpulib/src/slots/mappings.rs diff --git a/kea_gpu_shaderlib/src/slots/mod.rs b/kea_gpulib/src/slots/mod.rs similarity index 100% rename from kea_gpu_shaderlib/src/slots/mod.rs rename to kea_gpulib/src/slots/mod.rs diff --git a/kea_gpu_shaderlib/src/slots/slot.rs b/kea_gpulib/src/slots/slot.rs similarity index 100% rename from kea_gpu_shaderlib/src/slots/slot.rs rename to kea_gpulib/src/slots/slot.rs diff --git a/kea_gpu_shaderlib/src/slots/types.rs b/kea_gpulib/src/slots/types.rs similarity index 100% rename from kea_gpu_shaderlib/src/slots/types.rs rename to kea_gpulib/src/slots/types.rs diff --git a/kea_renderer/Cargo.toml b/kea_renderer/Cargo.toml index 3dfb6b9..41b2a46 100644 --- a/kea_renderer/Cargo.toml +++ b/kea_renderer/Cargo.toml @@ -6,7 +6,7 @@ license = "MIT" [dependencies] kea_gpu = { path = "../kea_gpu" } -kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" } +kea_gpulib = { path = "../kea_gpulib" } kea_renderer_shaders = { path = "../kea_renderer_shaders" } ash = { version = "0.37.2", features = ["linked"] } diff --git a/kea_renderer/src/scenes/scene.rs b/kea_renderer/src/scenes/scene.rs index f3fba09..91ba27a 100644 --- a/kea_renderer/src/scenes/scene.rs +++ b/kea_renderer/src/scenes/scene.rs @@ -7,7 +7,7 @@ use kea_gpu::{ slots::SlotBindings, storage::buffers::Buffer, }; -use kea_gpu_shaderlib::Aabb; +use kea_gpulib::Aabb; use kea_renderer_shaders::SlotId; use spirv_std::glam::{vec3a, Affine3A, Quat, Vec3, Vec3A}; use std::sync::Arc; diff --git a/kea_renderer_shaders/Cargo.toml b/kea_renderer_shaders/Cargo.toml index 6559cba..b573554 100644 --- a/kea_renderer_shaders/Cargo.toml +++ b/kea_renderer_shaders/Cargo.toml @@ -8,5 +8,5 @@ license = "MIT" crate-type = ["dylib", "lib"] [dependencies] -kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" } +kea_gpulib = { path = "../kea_gpulib" } spirv-std = { version = "0.7.0" } \ No newline at end of file diff --git a/kea_renderer_shaders/src/cameras/camera.rs b/kea_renderer_shaders/src/cameras/camera.rs index 4d1fc3d..07cb543 100644 --- a/kea_renderer_shaders/src/cameras/camera.rs +++ b/kea_renderer_shaders/src/cameras/camera.rs @@ -1,4 +1,4 @@ -use kea_gpu_shaderlib::Ray; +use kea_gpulib::Ray; use spirv_std::glam::{vec3, Vec3}; // Needed for .tan() diff --git a/kea_renderer_shaders/src/lib.rs b/kea_renderer_shaders/src/lib.rs index 33147e0..009e1ce 100644 --- a/kea_renderer_shaders/src/lib.rs +++ b/kea_renderer_shaders/src/lib.rs @@ -3,7 +3,7 @@ #![feature(const_type_id)] #![feature(asm_experimental_arch)] -use kea_gpu_shaderlib::{shaders::ShaderGroup, slots::Slot}; +use kea_gpulib::{shaders::ShaderGroup, slots::Slot}; pub mod cameras; pub mod lights; diff --git a/kea_renderer_shaders/src/path_tracer/entrypoints.rs b/kea_renderer_shaders/src/path_tracer/entrypoints.rs index e9b3da3..39671f1 100644 --- a/kea_renderer_shaders/src/path_tracer/entrypoints.rs +++ b/kea_renderer_shaders/src/path_tracer/entrypoints.rs @@ -2,7 +2,7 @@ use crate::{ cameras::{Camera, CameraParameters}, payload::RayPayload, }; -use kea_gpu_shaderlib::Ray; +use kea_gpulib::Ray; use spirv_std::{ glam::{vec2, vec3, Quat, UVec2, UVec3, Vec2, Vec3, Vec4, Vec4Swizzles}, ray_tracing::RayFlags, diff --git a/kea_renderer_shaders/src/path_tracer/mod.rs b/kea_renderer_shaders/src/path_tracer/mod.rs index d719183..f57d5a8 100644 --- a/kea_renderer_shaders/src/path_tracer/mod.rs +++ b/kea_renderer_shaders/src/path_tracer/mod.rs @@ -1,5 +1,5 @@ use crate::{ShaderGroupId, SlotId}; -use kea_gpu_shaderlib::{ +use kea_gpulib::{ shaders::{Shader, ShaderGroup}, slots::{ShaderStages, Slot, SlotType}, }; diff --git a/kea_renderer_shaders/src/spheres/entrypoints.rs b/kea_renderer_shaders/src/spheres/entrypoints.rs index 6f0ca0b..909f2fa 100644 --- a/kea_renderer_shaders/src/spheres/entrypoints.rs +++ b/kea_renderer_shaders/src/spheres/entrypoints.rs @@ -1,7 +1,7 @@ use spirv_std::spirv; use crate::{payload::RayPayload, spheres::Sphere}; -use kea_gpu_shaderlib::Ray; +use kea_gpulib::Ray; use spirv_std::{arch::report_intersection, glam::Vec3}; #[spirv(closest_hit)] diff --git a/kea_renderer_shaders/src/spheres/mod.rs b/kea_renderer_shaders/src/spheres/mod.rs index 43c5568..a53220e 100644 --- a/kea_renderer_shaders/src/spheres/mod.rs +++ b/kea_renderer_shaders/src/spheres/mod.rs @@ -3,7 +3,7 @@ mod sphere; use crate::{ShaderGroupId, SlotId}; use core::any::TypeId; -use kea_gpu_shaderlib::{ +use kea_gpulib::{ shaders::{Shader, ShaderGroup}, slots::{ShaderStages, Slot, SlotType}, }; diff --git a/kea_renderer_shaders/src/spheres/sphere.rs b/kea_renderer_shaders/src/spheres/sphere.rs index 99e0458..a1e67b6 100644 --- a/kea_renderer_shaders/src/spheres/sphere.rs +++ b/kea_renderer_shaders/src/spheres/sphere.rs @@ -1,4 +1,4 @@ -use kea_gpu_shaderlib::{Aabb, Ray}; +use kea_gpulib::{Aabb, Ray}; use spirv_std::glam::{vec3, Vec3, Vec3A}; // Needed for .sqrt() diff --git a/kea_renderer_shaders/src/triangles/mod.rs b/kea_renderer_shaders/src/triangles/mod.rs index 03ce584..fdc75f8 100644 --- a/kea_renderer_shaders/src/triangles/mod.rs +++ b/kea_renderer_shaders/src/triangles/mod.rs @@ -1,6 +1,6 @@ use crate::{ShaderGroupId, SlotId}; use core::any::TypeId; -use kea_gpu_shaderlib::{ +use kea_gpulib::{ shaders::{Shader, ShaderGroup}, slots::{ShaderStages, Slot, SlotType}, };