From 693517a7449282f7b030523054afa642492186c3 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 13 Sep 2024 17:16:45 -0400 Subject: [PATCH 1/2] Update yakui to fix its Vulkan code for older computers --- client/Cargo.toml | 4 ++-- client/src/graphics/base.rs | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/client/Cargo.toml b/client/Cargo.toml index 0e296a8c..b6da8c2b 100644 --- a/client/Cargo.toml +++ b/client/Cargo.toml @@ -14,8 +14,8 @@ server = { path = "../server" } tracing = "0.1.10" ash = { version = "0.38.0", default-features = false, features = ["loaded", "debug", "std"] } lahar = { git = "https://github.com/Ralith/lahar", rev = "7963ae5750ea61fa0a894dbb73d3be0ac77255d2" } -yakui = { git = "https://github.com/SecondHalfGames/yakui", rev = "273a4a1020803066b84ac69a7646893419c31385" } -yakui-vulkan = { git = "https://github.com/SecondHalfGames/yakui", rev = "273a4a1020803066b84ac69a7646893419c31385" } +yakui = { git = "https://github.com/SecondHalfGames/yakui", rev = "136f88d54f08fcb21a5215f422c8581f89d46dd2" } +yakui-vulkan = { git = "https://github.com/SecondHalfGames/yakui", rev = "136f88d54f08fcb21a5215f422c8581f89d46dd2" } winit = "0.30.4" ash-window = "0.13" raw-window-handle = "0.6" diff --git a/client/src/graphics/base.rs b/client/src/graphics/base.rs index 31641ba8..493c4dba 100644 --- a/client/src/graphics/base.rs +++ b/client/src/graphics/base.rs @@ -142,7 +142,8 @@ impl Base { .enabled_extension_names(&device_exts) .push_next( &mut vk::PhysicalDeviceVulkan12Features::default() - .descriptor_binding_partially_bound(true), + .descriptor_binding_partially_bound(true) + .descriptor_binding_sampled_image_update_after_bind(true), ), None, ) From faccb22b84caf0d67cbe73eb102035687aafe762 Mon Sep 17 00:00:00 2001 From: = <=> Date: Fri, 13 Sep 2024 17:25:19 -0400 Subject: [PATCH 2/2] Rerun gen-protos --- save/src/protos.rs | 5 ----- 1 file changed, 5 deletions(-) diff --git a/save/src/protos.rs b/save/src/protos.rs index ae49022c..fa03540a 100644 --- a/save/src/protos.rs +++ b/save/src/protos.rs @@ -1,19 +1,16 @@ // This file is @generated by prost-build. -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, Copy, PartialEq, ::prost::Message)] pub struct Meta { /// Number of voxels along the edge of a chunk #[prost(uint32, tag = "1")] pub chunk_size: u32, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Character { /// Graph edges to traverse from the origin to find the node containing the character's entity #[prost(bytes = "vec", tag = "1")] pub path: ::prost::alloc::vec::Vec, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct EntityNode { /// Entities whose origins lie within this node, each encoded as: @@ -21,14 +18,12 @@ pub struct EntityNode { #[prost(bytes = "vec", repeated, tag = "1")] pub entities: ::prost::alloc::vec::Vec<::prost::alloc::vec::Vec>, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct VoxelNode { /// Voxel data for each modified chunk #[prost(message, repeated, tag = "1")] pub chunks: ::prost::alloc::vec::Vec, } -#[allow(clippy::derive_partial_eq_without_eq)] #[derive(Clone, PartialEq, ::prost::Message)] pub struct Chunk { /// Which dodecahedron vertex is associated with this chunk