Rename kea_gpu_shaderlib to kea_gpulib

Shorter name, and I want to move away from using shader terminology.
main
Andrew O'Neil 1 month ago
parent 338c946375
commit dd78795cff

8
Cargo.lock generated

@ -939,7 +939,7 @@ dependencies = [
"ash-window", "ash-window",
"downcast-rs", "downcast-rs",
"gpu-allocator", "gpu-allocator",
"kea_gpu_shaderlib", "kea_gpulib",
"log", "log",
"memoffset 0.8.0", "memoffset 0.8.0",
"num-traits", "num-traits",
@ -950,7 +950,7 @@ dependencies = [
] ]
[[package]] [[package]]
name = "kea_gpu_shaderlib" name = "kea_gpulib"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"spirv-std", "spirv-std",
@ -967,7 +967,7 @@ dependencies = [
"env_logger", "env_logger",
"gpu-allocator", "gpu-allocator",
"kea_gpu", "kea_gpu",
"kea_gpu_shaderlib", "kea_gpulib",
"kea_renderer_shaders", "kea_renderer_shaders",
"log", "log",
"memoffset 0.8.0", "memoffset 0.8.0",
@ -979,7 +979,7 @@ dependencies = [
name = "kea_renderer_shaders" name = "kea_renderer_shaders"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"kea_gpu_shaderlib", "kea_gpulib",
"spirv-std", "spirv-std",
] ]

@ -1,7 +1,7 @@
[workspace] [workspace]
members = [ members = [
"kea_gpu", "kea_gpu",
"kea_gpu_shaderlib", "kea_gpulib",
"kea_renderer", "kea_renderer",
"kea_renderer_shaders", "kea_renderer_shaders",
] ]

@ -17,4 +17,4 @@ downcast-rs = "1.2.0"
spirv-builder = "0.7.0" spirv-builder = "0.7.0"
spirv-std = "0.7.0" spirv-std = "0.7.0"
kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" } kea_gpulib = { path = "../kea_gpulib" }

@ -2,7 +2,7 @@ use super::{acceleration_structure::AccelerationStructure, scratch_buffer::Scrat
use crate::{commands::CommandBuffer, device::Device, storage::buffers::Buffer}; use crate::{commands::CommandBuffer, device::Device, storage::buffers::Buffer};
use ash::vk; use ash::vk;
use gpu_allocator::MemoryLocation; use gpu_allocator::MemoryLocation;
use kea_gpu_shaderlib::Aabb; use kea_gpulib::Aabb;
use spirv_std::glam::Vec3A; use spirv_std::glam::Vec3A;
use std::{mem, slice, sync::Arc}; use std::{mem, slice, sync::Arc};

@ -5,7 +5,7 @@ use crate::{
storage::{buffers::Buffer, memory}, storage::{buffers::Buffer, memory},
}; };
use ash::vk; use ash::vk;
use kea_gpu_shaderlib::shaders::ShaderGroup; use kea_gpulib::shaders::ShaderGroup;
use std::{iter, sync::Arc}; use std::{iter, sync::Arc};
pub struct RayTracingShaderBindingTables { pub struct RayTracingShaderBindingTables {

@ -1,7 +1,7 @@
use super::{ShaderEntryPoint, ShaderModule}; use super::{ShaderEntryPoint, ShaderModule};
use crate::device::Device; use crate::device::Device;
use ash::vk; use ash::vk;
use kea_gpu_shaderlib::shaders::{Shader, ShaderGroup}; use kea_gpulib::shaders::{Shader, ShaderGroup};
use std::{collections::HashMap, ffi::CString, sync::Arc}; use std::{collections::HashMap, ffi::CString, sync::Arc};
pub struct ShaderGroups<ShaderGroupId> { pub struct ShaderGroups<ShaderGroupId> {

@ -6,7 +6,7 @@ use crate::{
storage::{buffers::Buffer, images::ImageView}, storage::{buffers::Buffer, images::ImageView},
}; };
use ash::vk; use ash::vk;
use kea_gpu_shaderlib::slots::SlotType; use kea_gpulib::slots::SlotType;
use std::{collections::HashMap, hash::Hash, slice, sync::Arc}; use std::{collections::HashMap, hash::Hash, slice, sync::Arc};
pub struct SlotBindings<SlotId> { pub struct SlotBindings<SlotId> {

@ -1,6 +1,6 @@
use crate::descriptors::DescriptorSetLayoutBinding; use crate::descriptors::DescriptorSetLayoutBinding;
use ash::vk; use ash::vk;
use kea_gpu_shaderlib::slots::{Slot, SlotType}; use kea_gpulib::slots::{Slot, SlotType};
pub struct SlotLayout<SlotId> { pub struct SlotLayout<SlotId> {
slots: Vec<(SlotId, Slot)>, slots: Vec<(SlotId, Slot)>,

@ -1,5 +1,5 @@
[package] [package]
name = "kea_gpu_shaderlib" name = "kea_gpulib"
version = "0.1.0" version = "0.1.0"
edition = "2021" edition = "2021"
license = "MIT" license = "MIT"

@ -6,7 +6,7 @@ license = "MIT"
[dependencies] [dependencies]
kea_gpu = { path = "../kea_gpu" } kea_gpu = { path = "../kea_gpu" }
kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" } kea_gpulib = { path = "../kea_gpulib" }
kea_renderer_shaders = { path = "../kea_renderer_shaders" } kea_renderer_shaders = { path = "../kea_renderer_shaders" }
ash = { version = "0.37.2", features = ["linked"] } ash = { version = "0.37.2", features = ["linked"] }

@ -7,7 +7,7 @@ use kea_gpu::{
slots::SlotBindings, slots::SlotBindings,
storage::buffers::Buffer, storage::buffers::Buffer,
}; };
use kea_gpu_shaderlib::Aabb; use kea_gpulib::Aabb;
use kea_renderer_shaders::SlotId; use kea_renderer_shaders::SlotId;
use spirv_std::glam::{vec3a, Affine3A, Quat, Vec3, Vec3A}; use spirv_std::glam::{vec3a, Affine3A, Quat, Vec3, Vec3A};
use std::sync::Arc; use std::sync::Arc;

@ -8,5 +8,5 @@ license = "MIT"
crate-type = ["dylib", "lib"] crate-type = ["dylib", "lib"]
[dependencies] [dependencies]
kea_gpu_shaderlib = { path = "../kea_gpu_shaderlib" } kea_gpulib = { path = "../kea_gpulib" }
spirv-std = { version = "0.7.0" } spirv-std = { version = "0.7.0" }

@ -1,4 +1,4 @@
use kea_gpu_shaderlib::Ray; use kea_gpulib::Ray;
use spirv_std::glam::{vec3, Vec3}; use spirv_std::glam::{vec3, Vec3};
// Needed for .tan() // Needed for .tan()

@ -3,7 +3,7 @@
#![feature(const_type_id)] #![feature(const_type_id)]
#![feature(asm_experimental_arch)] #![feature(asm_experimental_arch)]
use kea_gpu_shaderlib::{shaders::ShaderGroup, slots::Slot}; use kea_gpulib::{shaders::ShaderGroup, slots::Slot};
pub mod cameras; pub mod cameras;
pub mod lights; pub mod lights;

@ -2,7 +2,7 @@ use crate::{
cameras::{Camera, CameraParameters}, cameras::{Camera, CameraParameters},
payload::RayPayload, payload::RayPayload,
}; };
use kea_gpu_shaderlib::Ray; use kea_gpulib::Ray;
use spirv_std::{ use spirv_std::{
glam::{vec2, vec3, Quat, UVec2, UVec3, Vec2, Vec3, Vec4, Vec4Swizzles}, glam::{vec2, vec3, Quat, UVec2, UVec3, Vec2, Vec3, Vec4, Vec4Swizzles},
ray_tracing::RayFlags, ray_tracing::RayFlags,

@ -1,5 +1,5 @@
use crate::{ShaderGroupId, SlotId}; use crate::{ShaderGroupId, SlotId};
use kea_gpu_shaderlib::{ use kea_gpulib::{
shaders::{Shader, ShaderGroup}, shaders::{Shader, ShaderGroup},
slots::{ShaderStages, Slot, SlotType}, slots::{ShaderStages, Slot, SlotType},
}; };

@ -1,7 +1,7 @@
use spirv_std::spirv; use spirv_std::spirv;
use crate::{payload::RayPayload, spheres::Sphere}; use crate::{payload::RayPayload, spheres::Sphere};
use kea_gpu_shaderlib::Ray; use kea_gpulib::Ray;
use spirv_std::{arch::report_intersection, glam::Vec3}; use spirv_std::{arch::report_intersection, glam::Vec3};
#[spirv(closest_hit)] #[spirv(closest_hit)]

@ -3,7 +3,7 @@ mod sphere;
use crate::{ShaderGroupId, SlotId}; use crate::{ShaderGroupId, SlotId};
use core::any::TypeId; use core::any::TypeId;
use kea_gpu_shaderlib::{ use kea_gpulib::{
shaders::{Shader, ShaderGroup}, shaders::{Shader, ShaderGroup},
slots::{ShaderStages, Slot, SlotType}, slots::{ShaderStages, Slot, SlotType},
}; };

@ -1,4 +1,4 @@
use kea_gpu_shaderlib::{Aabb, Ray}; use kea_gpulib::{Aabb, Ray};
use spirv_std::glam::{vec3, Vec3, Vec3A}; use spirv_std::glam::{vec3, Vec3, Vec3A};
// Needed for .sqrt() // Needed for .sqrt()

@ -1,6 +1,6 @@
use crate::{ShaderGroupId, SlotId}; use crate::{ShaderGroupId, SlotId};
use core::any::TypeId; use core::any::TypeId;
use kea_gpu_shaderlib::{ use kea_gpulib::{
shaders::{Shader, ShaderGroup}, shaders::{Shader, ShaderGroup},
slots::{ShaderStages, Slot, SlotType}, slots::{ShaderStages, Slot, SlotType},
}; };

Loading…
Cancel
Save