From 794e35ab4a5bd41e13e3635dcf97358c0d1a7fa3 Mon Sep 17 00:00:00 2001
From: StarArawn <toasterthegamer@gmail.com>
Date: Thu, 23 Dec 2021 09:02:06 -0500
Subject: [PATCH] Updated to the latest bevy version.
---
kayak_font/Cargo.toml | 4 ++--
kayak_font/examples/renderer/pipeline.rs | 13 +++++--------
kayak_font/examples/renderer/shader.wgsl | 1 -
3 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/kayak_font/Cargo.toml b/kayak_font/Cargo.toml
index 28aa86b..ee051c7 100644
--- a/kayak_font/Cargo.toml
+++ b/kayak_font/Cargo.toml
@@ -7,9 +7,9 @@ edition = "2021"
[dependencies]
anyhow = { version = "1.0" }
-bevy = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
+bevy = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
bytemuck = "1.7.2"
-crevice = { git = "https://github.com/bevyengine/bevy", rev = "9a16a4d01830297987db40b45f03382ed3acad62" }
+crevice = { git = "https://github.com/bevyengine/bevy", rev = "081350916c39fc1c7c9d659ccb6d86413832b465" }
serde = "1.0"
serde_json = "1.0"
serde_path_to_error = "0.1"
diff --git a/kayak_font/examples/renderer/pipeline.rs b/kayak_font/examples/renderer/pipeline.rs
index e3337e5..66082d3 100644
--- a/kayak_font/examples/renderer/pipeline.rs
+++ b/kayak_font/examples/renderer/pipeline.rs
@@ -16,9 +16,9 @@ use bevy::{
BlendFactor, BlendOperation, BlendState, BufferBindingType, BufferSize, BufferUsages,
BufferVec, CachedPipelineId, ColorTargetState, ColorWrites, FragmentState, FrontFace,
MultisampleState, PolygonMode, PrimitiveState, PrimitiveTopology, RenderPipelineCache,
- RenderPipelineDescriptor, Shader, ShaderStages, TextureFormat, TextureSampleType,
- TextureViewDimension, VertexAttribute, VertexBufferLayout, VertexFormat, VertexState,
- VertexStepMode,
+ RenderPipelineDescriptor, SamplerBindingType, Shader, ShaderStages, TextureFormat,
+ TextureSampleType, TextureViewDimension, VertexAttribute, VertexBufferLayout,
+ VertexFormat, VertexState, VertexStepMode,
},
renderer::{RenderDevice, RenderQueue},
texture::{BevyDefault, GpuImage},
@@ -93,10 +93,7 @@ impl FromWorld for FontPipeline {
BindGroupLayoutEntry {
binding: 1,
visibility: ShaderStages::FRAGMENT,
- ty: BindingType::Sampler {
- comparison: false,
- filtering: true,
- },
+ ty: BindingType::Sampler(SamplerBindingType::Filtering),
count: None,
},
],
@@ -165,10 +162,10 @@ impl FromWorld for FontPipeline {
front_face: FrontFace::Ccw,
cull_mode: None,
polygon_mode: PolygonMode::Fill,
- clamp_depth: false,
conservative: false,
topology: PrimitiveTopology::TriangleList,
strip_index_format: None,
+ unclipped_depth: false,
},
depth_stencil: None,
multisample: MultisampleState {
diff --git a/kayak_font/examples/renderer/shader.wgsl b/kayak_font/examples/renderer/shader.wgsl
index 097890a..5213429 100644
--- a/kayak_font/examples/renderer/shader.wgsl
+++ b/kayak_font/examples/renderer/shader.wgsl
@@ -1,4 +1,3 @@
-[[block]]
struct View {
view_proj: mat4x4<f32>;
world_position: vec3<f32>;
--
GitLab