Skip to content

fixes and cleanups #23

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Firestar99 merged 3 commits into from
Oct 14, 2026
Merged

fixes and cleanups #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
43928ac
cargo update
Firestar99 Oct 14, 2026
4a3b827
move fragment shader to the top
Firestar99 Oct 12, 2026
36096f5
fix template not using glam.workspace
Firestar99 Oct 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
238 changes: 131 additions & 107 deletions Cargo.lock
View file
Open in desktop

Large diffs are not rendered by default.

10 changes: 5 additions & 5 deletions generated/graphics/ash/cargo-gpu/mygraphics-shaders/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ use glam::{Vec2, Vec3, Vec4, vec2, vec3};
use spirv_std::num_traits::Float;
use spirv_std::spirv;

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[derive(Copy, Clone, Pod, Zeroable)]
#[repr(C)]
pub struct ShaderConstants {
Expand All @@ -15,11 +20,6 @@ pub struct ShaderConstants {
pub offset: Vec2,
}

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[spirv(vertex)]
pub fn main_vs(
#[spirv(vertex_index)] vert_id: i32,
Expand Down
4 changes: 2 additions & 2 deletions generated/graphics/ash/cargo-gpu/mygraphics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ ash-window.workspace = true
gpu-allocator.workspace = true

# math libraries
glam = { version = "0.33.11", default-features = false, features = ["bytemuck"] }
bytemuck = { version = "1.24.0", features = ["derive"] }
glam.workspace = true
bytemuck.workspace = true

# other
raw-window-handle.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions generated/graphics/ash/spirv-builder/mygraphics-shaders/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ use glam::{Vec2, Vec3, Vec4, vec2, vec3};
use spirv_std::num_traits::Float;
use spirv_std::spirv;

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[derive(Copy, Clone, Pod, Zeroable)]
#[repr(C)]
pub struct ShaderConstants {
Expand All @@ -15,11 +20,6 @@ pub struct ShaderConstants {
pub offset: Vec2,
}

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[spirv(vertex)]
pub fn main_vs(
#[spirv(vertex_index)] vert_id: i32,
Expand Down
4 changes: 2 additions & 2 deletions generated/graphics/ash/spirv-builder/mygraphics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ ash-window.workspace = true
gpu-allocator.workspace = true

# math libraries
glam = { version = "0.33.11", default-features = false, features = ["bytemuck"] }
bytemuck = { version = "1.24.0", features = ["derive"] }
glam.workspace = true
bytemuck.workspace = true

# other
raw-window-handle.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions generated/graphics/wgpu/cargo-gpu/mygraphics-shaders/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ use glam::{Vec2, Vec3, Vec4, vec2, vec3};
use spirv_std::num_traits::Float;
use spirv_std::spirv;

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[derive(Copy, Clone, Pod, Zeroable)]
#[repr(C)]
pub struct ShaderConstants {
Expand All @@ -15,11 +20,6 @@ pub struct ShaderConstants {
pub offset: Vec2,
}

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[spirv(vertex)]
pub fn main_vs(
#[spirv(vertex_index)] vert_id: i32,
Expand Down
4 changes: 2 additions & 2 deletions generated/graphics/wgpu/cargo-gpu/mygraphics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ pollster.workspace = true
env_logger.workspace = true

# math libraries
glam = { version = "0.33.11", default-features = false, features = ["bytemuck"] }
bytemuck = { version = "1.24.0", features = ["derive"] }
glam.workspace = true
bytemuck.workspace = true

# other
raw-window-handle.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions generated/graphics/wgpu/spirv-builder/mygraphics-shaders/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ use glam::{Vec2, Vec3, Vec4, vec2, vec3};
use spirv_std::num_traits::Float;
use spirv_std::spirv;

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[derive(Copy, Clone, Pod, Zeroable)]
#[repr(C)]
pub struct ShaderConstants {
Expand All @@ -15,11 +20,6 @@ pub struct ShaderConstants {
pub offset: Vec2,
}

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[spirv(vertex)]
pub fn main_vs(
#[spirv(vertex_index)] vert_id: i32,
Expand Down
4 changes: 2 additions & 2 deletions generated/graphics/wgpu/spirv-builder/mygraphics/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ pollster.workspace = true
env_logger.workspace = true

# math libraries
glam = { version = "0.33.11", default-features = false, features = ["bytemuck"] }
bytemuck = { version = "1.24.0", features = ["derive"] }
glam.workspace = true
bytemuck.workspace = true

# other
raw-window-handle.workspace = true
Expand Down
10 changes: 5 additions & 5 deletions graphics/mygraphics-shaders/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ use glam::{Vec2, Vec3, Vec4, vec2, vec3};
use spirv_std::num_traits::Float;
use spirv_std::spirv;

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[derive(Copy, Clone, Pod, Zeroable)]
#[repr(C)]
pub struct ShaderConstants {
Expand All @@ -15,11 +20,6 @@ pub struct ShaderConstants {
pub offset: Vec2,
}

#[spirv(fragment)]
pub fn main_fs(vtx_color: Vec3, output: &mut Vec4) {
*output = Vec4::from((vtx_color, 1.));
}

#[spirv(vertex)]
pub fn main_vs(
#[spirv(vertex_index)] vert_id: i32,
Expand Down
4 changes: 2 additions & 2 deletions graphics/mygraphics/Cargo.toml.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ env_logger.workspace = true
{%- endif %}

# math libraries
glam = { version = "0.33.11", default-features = false, features = ["bytemuck"] }
bytemuck = { version = "1.24.0", features = ["derive"] }
glam.workspace = true
bytemuck.workspace = true

# other
raw-window-handle.workspace = true
Expand Down
Loading