diff --git a/kayak_font/Cargo.toml b/kayak_font/Cargo.toml index 28aa86be8646f9b01903dc24802924efb326c7be..ee051c7279b62ad04b27ee61708e5e851b6d664c 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 e3337e5ca5a8e75939a281900e0962723e51432b..66082d399379f9c61e5619cf6ef5e7116e3f250b 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 097890a21b4d880e4b2b3fe10a5c25ee0bfa411a..5213429eb5757c9c107e851fde4292f9dcfd527c 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>;