fix warnings

This commit is contained in:
janis 2026-10-22 20:39:47 +02:00
parent cfc5f8594c
commit 6e9da846bb
Signed by: janis
SSH key fingerprint: SHA256:bB1qbbqmDXZNT0KKD5c2Dfjg53JGhj7B3CFcLIzSqq8
7 changed files with 24 additions and 21 deletions

View file

@ -40,10 +40,10 @@ thread_local = "1.1.8"
ash = "0.38.0" ash = "0.38.0"
ash-window = "0.13.0" ash-window = "0.13.0"
vk-mem = "0.5.0" # vk-mem = "0.5.0"
gpu-allocator = { git = "https://github.com/janis-bhm/gpu-allocator", branch = "main" } gpu-allocator = { git = "https://github.com/janis-bhm/gpu-allocator", branch = "main" }
rectangle-pack = "0.4.2" rectangle-pack = "0.4.2"
vk-sync = "0.1.6" # vk-sync = "0.1.6"
arrayvec = "0.7.6" arrayvec = "0.7.6"
tinyvec = "1.8" tinyvec = "1.8"
@ -57,10 +57,10 @@ md-5 = "0.11.0"
parking_lot = "0.12.3" parking_lot = "0.12.3"
tokio = "1.42" # tokio = "1.42"
futures = "0.3" # futures = "0.3"
smol = "2.0" smol = "2.0"
rayon = "1.10" # rayon = "1.10"
winit = {version = "0.30.5", features = ["rwh_06"]} winit = {version = "0.30.5", features = ["rwh_06"]}
raw-window-handle = "0.6" raw-window-handle = "0.6"
@ -73,17 +73,17 @@ bevy_app = { path = "/var/code/bevy-engine/bevy/crates/bevy_app" }
bevy_asset = { path = "/var/code/bevy-engine/bevy/crates/bevy_asset" } bevy_asset = { path = "/var/code/bevy-engine/bevy/crates/bevy_asset" }
bevy_derive = { path = "/var/code/bevy-engine/bevy/crates/bevy_derive" } bevy_derive = { path = "/var/code/bevy-engine/bevy/crates/bevy_derive" }
bevy_ecs = { path = "/var/code/bevy-engine/bevy/crates/bevy_ecs", features = ["multi_threaded", "trace"]} bevy_ecs = { path = "/var/code/bevy-engine/bevy/crates/bevy_ecs", features = ["multi_threaded", "trace"]}
bevy_hierarchy = { path = "/var/code/bevy-engine/bevy/crates/bevy_hierarchy" } # bevy_hierarchy = { path = "/var/code/bevy-engine/bevy/crates/bevy_hierarchy" }
bevy_log = { path = "/var/code/bevy-engine/bevy/crates/bevy_log" } bevy_log = { path = "/var/code/bevy-engine/bevy/crates/bevy_log" }
bevy_math = { path = "/var/code/bevy-engine/bevy/crates/bevy_math" } # bevy_math = { path = "/var/code/bevy-engine/bevy/crates/bevy_math" }
bevy_platform = { path = "/var/code/bevy-engine/bevy/crates/bevy_platform" } bevy_platform = { path = "/var/code/bevy-engine/bevy/crates/bevy_platform" }
bevy_reflect = { path = "/var/code/bevy-engine/bevy/crates/bevy_reflect" } bevy_reflect = { path = "/var/code/bevy-engine/bevy/crates/bevy_reflect" }
bevy_tasks = { path = "/var/code/bevy-engine/bevy/crates/bevy_tasks" } bevy_tasks = { path = "/var/code/bevy-engine/bevy/crates/bevy_tasks" }
bevy_time = { path = "/var/code/bevy-engine/bevy/crates/bevy_time" } bevy_time = { path = "/var/code/bevy-engine/bevy/crates/bevy_time" }
bevy_transform = { path = "/var/code/bevy-engine/bevy/crates/bevy_transform" } # bevy_transform = { path = "/var/code/bevy-engine/bevy/crates/bevy_transform" }
bevy_utils = { path = "/var/code/bevy-engine/bevy/crates/bevy_utils" } bevy_utils = { path = "/var/code/bevy-engine/bevy/crates/bevy_utils" }
bevy_window = { path = "/var/code/bevy-engine/bevy/crates/bevy_window" } bevy_window = { path = "/var/code/bevy-engine/bevy/crates/bevy_window" }
bevy_winit = { path = "/var/code/bevy-engine/bevy/crates/bevy_winit" } # bevy_winit = { path = "/var/code/bevy-engine/bevy/crates/bevy_winit" }
[[example]] [[example]]
name = "bevy_integration" name = "bevy_integration"

View file

@ -10,7 +10,7 @@ indexmap = { workspace = true }
petgraph = { workspace = true } petgraph = { workspace = true }
itertools = { workspace = true } itertools = { workspace = true }
ahash = { workspace = true } ahash = { workspace = true }
rand = { workspace = true } # rand = { workspace = true }
parking_lot = { workspace = true } parking_lot = { workspace = true }
glam = { workspace = true } glam = { workspace = true }
bitflags = { workspace = true } bitflags = { workspace = true }
@ -22,7 +22,7 @@ tracing = { workspace = true }
ash = { workspace = true } ash = { workspace = true }
ash-window = { workspace = true } ash-window = { workspace = true }
vk-mem = { workspace = true } # vk-mem = { workspace = true }
gpu-allocator = { workspace = true } gpu-allocator = { workspace = true }
rectangle-pack = { workspace = true } rectangle-pack = { workspace = true }
@ -30,13 +30,13 @@ md-5 = { workspace = true }
raw-window-handle = { workspace = true } raw-window-handle = { workspace = true }
egui = { workspace = true , features = ["bytemuck"]} egui = { workspace = true , features = ["bytemuck"]}
egui_winit_platform = { workspace = true } # egui_winit_platform = { workspace = true }
futures = { workspace = true } #futures = { workspace = true }
smol = { workspace = true } smol = { workspace = true }
# tokio = {workspace = true, features = ["rt", "sync"]} # tokio = {workspace = true, features = ["rt", "sync"]}
bevy_tasks = { workspace = true } # bevy_tasks = { workspace = true }
derive_more = { workspace = true , features = ["debug"] } derive_more = { workspace = true , features = ["debug"] }

View file

@ -1443,6 +1443,7 @@ impl From<vk::Format> for FormatClass {
} }
} }
#[expect(dead_code)]
pub fn format_to_aspect_mask(format: vk::Format) -> vk::ImageAspectFlags { pub fn format_to_aspect_mask(format: vk::Format) -> vk::ImageAspectFlags {
use vk::Format as F; use vk::Format as F;
match format { match format {

View file

@ -1,7 +1,6 @@
#![feature( #![feature(
negative_impls, negative_impls,
map_try_insert, map_try_insert,
debug_closure_helpers,
core_io, core_io,
core_io_borrowed_buf, core_io_borrowed_buf,
slice_partition_dedup slice_partition_dedup
@ -36,7 +35,7 @@ pub mod sync;
mod text; mod text;
pub mod util; pub mod util;
use device::{Device, DeviceOwned}; use device::Device;
mod texture { mod texture {
use std::{collections::BTreeMap, sync::Arc}; use std::{collections::BTreeMap, sync::Arc};

View file

@ -337,7 +337,7 @@ impl<'cmd> CommandList<'cmd> {
// construct barriers // construct barriers
// TODO: need to know each images aspects at this point // TODO: need to know each images aspects at this point
for barrier in barriers { for _barrier in barriers {
// stuff // stuff
} }

View file

@ -1,7 +1,10 @@
use std::sync::Arc; use std::sync::Arc;
use ash::vk; use ash::vk;
use glam::{f32::Mat4, vec3}; use glam::{
camera::rh::{proj, view},
vec3,
};
use gpu_allocator::MemoryLocation; use gpu_allocator::MemoryLocation;
pub use crate::egui_pass::{egui_pass, egui_pre_pass}; pub use crate::egui_pass::{egui_pass, egui_pre_pass};
@ -319,14 +322,14 @@ impl Wireframe {
let cmd = &ctx.cmd; let cmd = &ctx.cmd;
//let model = Mat4::from_scale(vec3(0.01, 0.01, 0.01)); //let model = Mat4::from_scale(vec3(0.01, 0.01, 0.01));
let proj = Mat4::perspective_lh( let proj = proj::vulkan::perspective(
core::f32::consts::FRAC_PI_4, core::f32::consts::FRAC_PI_4,
target.width() as f32 / target.height() as f32, target.width() as f32 / target.height() as f32,
0.1, 0.1,
100.0, 100.0,
); );
let pos = vec3(0.0, 0.0, -5.0); let pos = vec3(0.0, 0.0, -5.0);
let view = Mat4::look_at_rh(pos, pos + vec3(0.0, 0.0, 1.0), vec3(0.0, 1.0, 0.0)); let view = view::look_at_mat4(pos, pos + vec3(0.0, 0.0, 1.0), vec3(0.0, 1.0, 0.0));
let to_clip = proj * view; // * model; let to_clip = proj * view; // * model;
let color_attachment = &vk::RenderingAttachmentInfo::default() let color_attachment = &vk::RenderingAttachmentInfo::default()

View file

@ -62,7 +62,7 @@ impl SyncThreadpool {
use std::sync::atomic::Ordering; use std::sync::atomic::Ordering;
match self match self
.num_threads .num_threads
.fetch_update(Ordering::Release, Ordering::Acquire, |i| { .try_update(Ordering::Release, Ordering::Acquire, |i| {
if i < self.max_threads { if i < self.max_threads {
Some(i + 1) Some(i + 1)
} else { } else {