updated to wgpu and naga v23.0.0

AscendingCreations · Oct 30, 2024 · 26f1325 · 26f1325
1 parent 4217e6d
commit 26f1325
Show file tree

Hide file tree

Showing 8 changed files with 250 additions and 288 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,20 +4,20 @@ members = ["input", "camera", "graphics"]
 
 [workspace.dependencies]
 async-trait = "0.1.83"
-bytemuck = { version = "1.18.0", features = ["derive"] }
-thiserror = "1.0.64"
+bytemuck = { version = "1.19.0", features = ["derive"] }
+thiserror = "1.0.65"
 winit = { version = "0.30.5", features = ["serde"] }
-image = "0.25.2"
+image = "0.25.4"
 guillotiere = "0.6.2"
-serde = { version = "1.0.210", features = ["derive"] }
+serde = { version = "1.0.214", features = ["derive"] }
 log = "0.4.22"
 cosmic-text = { version = "0.12.1", features = ["shape-run-cache"] } #git = "https://github.com/pop-os/cosmic-text"
-ordered-float = { version = "4.3.0", features = ["serde"] }
-lru = "0.12.4"
-glam = { version = "0.29.0", features = ["bytemuck", "mint"] }
+ordered-float = { version = "4.4.0", features = ["serde"] }
+lru = "0.12.5"
+glam = { version = "0.29.1", features = ["bytemuck", "mint"] }
 lyon = "1.0.1"
-smol_str = "0.3.1"
-indexmap = "2.5.0"
+smol_str = "0.3.2"
+indexmap = "2.6.0"
 slotmap = "1.0.7"
 ahash = {version = "0.8.11", features = ["serde"]}
 slab = "0.4.9"
@@ -35,11 +35,11 @@ version = "0.3.0"
 [workspace.dependencies.naga]
 #git = "https://github.com/gfx-rs/naga"
 #rev = "76003dc0035d53a474d366dcdf49d2e4d12e921f"
-version = "22.1.0"
+version = "23.0.0"
 features = ["wgsl-in"]
 
 [workspace.dependencies.wgpu]
 #git = "https://github.com/gfx-rs/wgpu"
 #rev = "061e04b"
 #path = "../wgpu-trunk/wgpu"
-version = "22.1.0"
+version = "23.0.0"
diff --git a/graphics/src/font/pipeline.rs b/graphics/src/font/pipeline.rs
@@ -46,7 +46,7 @@ impl PipeLineLayout for TextRenderPipeline {
                 )),
                 vertex: wgpu::VertexState {
                     module: &shader,
-                    entry_point: "vertex",
+                    entry_point: Some("vertex"),
                     buffers: &[
                         wgpu::VertexBufferLayout {
                             array_stride: StaticVertexBuffer::stride(),
@@ -82,7 +82,7 @@ impl PipeLineLayout for TextRenderPipeline {
                 multisample: wgpu::MultisampleState::default(),
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                    entry_point: "fragment",
+                    entry_point: Some("fragment"),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: surface_format,
                         blend: Some(

diff --git a/graphics/src/images/pipeline.rs b/graphics/src/images/pipeline.rs
@@ -42,7 +42,7 @@ impl PipeLineLayout for ImageRenderPipeline {
                 )),
                 vertex: wgpu::VertexState {
                     module: &shader,
-                    entry_point: "vertex",
+                    entry_point: Some("vertex"),
                     buffers: &[
                         wgpu::VertexBufferLayout {
                             array_stride: StaticVertexBuffer::stride(),
@@ -78,7 +78,7 @@ impl PipeLineLayout for ImageRenderPipeline {
                 multisample: wgpu::MultisampleState::default(),
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                    entry_point: "fragment",
+                    entry_point: Some("fragment"),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: surface_format,
                         blend: Some(wgpu::BlendState::ALPHA_BLENDING),

diff --git a/graphics/src/lights/pipeline.rs b/graphics/src/lights/pipeline.rs
@@ -48,7 +48,7 @@ impl PipeLineLayout for LightRenderPipeline {
                 )),
                 vertex: wgpu::VertexState {
                     module: &shader,
-                    entry_point: "vertex",
+                    entry_point: Some("vertex"),
                     buffers: &[
                         wgpu::VertexBufferLayout {
                             array_stride: StaticVertexBuffer::stride(),
@@ -84,7 +84,7 @@ impl PipeLineLayout for LightRenderPipeline {
                 multisample: wgpu::MultisampleState::default(),
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                    entry_point: "fragment",
+                    entry_point: Some("fragment"),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: surface_format,
                         blend: Some(wgpu::BlendState::ALPHA_BLENDING),

diff --git a/graphics/src/maps/pipeline.rs b/graphics/src/maps/pipeline.rs
@@ -42,7 +42,7 @@ impl PipeLineLayout for MapRenderPipeline {
                 )),
                 vertex: wgpu::VertexState {
                     module: &shader,
-                    entry_point: "vertex",
+                    entry_point: Some("vertex"),
                     buffers: &[
                         wgpu::VertexBufferLayout {
                             array_stride: StaticVertexBuffer::stride(),
@@ -78,7 +78,7 @@ impl PipeLineLayout for MapRenderPipeline {
                 multisample: wgpu::MultisampleState::default(),
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                    entry_point: "fragment",
+                    entry_point: Some("fragment"),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: surface_format,
                         blend: Some(wgpu::BlendState::ALPHA_BLENDING),

diff --git a/graphics/src/mesh2d/pipeline.rs b/graphics/src/mesh2d/pipeline.rs
@@ -41,7 +41,7 @@ impl PipeLineLayout for Mesh2DRenderPipeline {
                 )),
                 vertex: wgpu::VertexState {
                     module: &shader,
-                    entry_point: "vertex",
+                    entry_point: Some("vertex"),
                     buffers: &[wgpu::VertexBufferLayout {
                         array_stride: Mesh2DVertex::stride() as u64,
                         step_mode: wgpu::VertexStepMode::Vertex,
@@ -68,7 +68,7 @@ impl PipeLineLayout for Mesh2DRenderPipeline {
                 multisample: wgpu::MultisampleState::default(),
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                    entry_point: "fragment",
+                    entry_point: Some("fragment"),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: surface_format,
                         blend: Some(wgpu::BlendState::ALPHA_BLENDING),

diff --git a/graphics/src/ui/pipeline.rs b/graphics/src/ui/pipeline.rs
@@ -42,7 +42,7 @@ impl PipeLineLayout for RectRenderPipeline {
                 )),
                 vertex: wgpu::VertexState {
                     module: &shader,
-                    entry_point: "vertex",
+                    entry_point: Some("vertex"),
                     buffers: &[
                         wgpu::VertexBufferLayout {
                             array_stride: StaticVertexBuffer::stride(),
@@ -78,7 +78,7 @@ impl PipeLineLayout for RectRenderPipeline {
                 multisample: wgpu::MultisampleState::default(),
                 fragment: Some(wgpu::FragmentState {
                     module: &shader,
-                    entry_point: "fragment",
+                    entry_point: Some("fragment"),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: surface_format,
                         blend: Some(wgpu::BlendState::ALPHA_BLENDING),