diff --git a/all-is-cubes-gpu/src/in_wgpu/bloom.rs b/all-is-cubes-gpu/src/in_wgpu/bloom.rs
index 100b50821..671af55f0 100644
--- a/all-is-cubes-gpu/src/in_wgpu/bloom.rs
+++ b/all-is-cubes-gpu/src/in_wgpu/bloom.rs
@@ -62,13 +62,13 @@ impl BloomPipelines {
             layout: Some(&pipeline_layout),
             vertex: wgpu::VertexState {
                 module: shaders.bloom.get(),
-                entry_point: "bloom_vertex",
+                entry_point: Some("bloom_vertex"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 buffers: &[],
             },
             fragment: Some(wgpu::FragmentState {
                 module: shaders.bloom.get(),
-                entry_point: "bloom_downsample_fragment",
+                entry_point: Some("bloom_downsample_fragment"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 targets: &[Some(wgpu::ColorTargetState {
                     format: linear_scene_texture_format,
@@ -88,13 +88,13 @@ impl BloomPipelines {
             layout: Some(&pipeline_layout),
             vertex: wgpu::VertexState {
                 module: shaders.bloom.get(),
-                entry_point: "bloom_vertex",
+                entry_point: Some("bloom_vertex"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 buffers: &[],
             },
             fragment: Some(wgpu::FragmentState {
                 module: shaders.bloom.get(),
-                entry_point: "bloom_upsample_fragment",
+                entry_point: Some("bloom_upsample_fragment"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 targets: &[Some(wgpu::ColorTargetState {
                     format: linear_scene_texture_format,
diff --git a/all-is-cubes-gpu/src/in_wgpu/pipelines.rs b/all-is-cubes-gpu/src/in_wgpu/pipelines.rs
index 5b5b12334..b89bed473 100644
--- a/all-is-cubes-gpu/src/in_wgpu/pipelines.rs
+++ b/all-is-cubes-gpu/src/in_wgpu/pipelines.rs
@@ -186,13 +186,13 @@ impl Pipelines {
                 layout: Some(&block_render_pipeline_layout),
                 vertex: wgpu::VertexState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "block_vertex_main",
+                    entry_point: Some("block_vertex_main"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     buffers: vertex_buffers,
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "block_fragment_opaque",
+                    entry_point: Some("block_fragment_opaque"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: fb.linear_scene_texture_format(),
@@ -219,19 +219,19 @@ impl Pipelines {
                 layout: Some(&block_render_pipeline_layout),
                 vertex: wgpu::VertexState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "block_vertex_main",
+                    entry_point: Some("block_vertex_main"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     buffers: vertex_buffers,
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: match current_graphics_options.transparency {
+                    entry_point: Some(match current_graphics_options.transparency {
                         TransparencyOption::Volumetric => "block_fragment_transparent_volumetric",
                         TransparencyOption::Surface | TransparencyOption::Threshold(_) => {
                             "block_fragment_transparent_surface"
                         }
                         ref t => panic!("unimplemented transparency option {t:?}"),
-                    },
+                    }),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: fb.linear_scene_texture_format(),
@@ -274,13 +274,13 @@ impl Pipelines {
                 // uses the skybox texture too.
                 vertex: wgpu::VertexState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "skybox_vertex",
+                    entry_point: Some("skybox_vertex"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     buffers: &[],
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "skybox_fragment",
+                    entry_point: Some("skybox_fragment"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: fb.linear_scene_texture_format(),
@@ -315,13 +315,13 @@ impl Pipelines {
                 layout: Some(&lines_render_pipeline_layout),
                 vertex: wgpu::VertexState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "lines_vertex",
+                    entry_point: Some("lines_vertex"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     buffers: &[WgpuLinesVertex::desc()],
                 },
                 fragment: Some(wgpu::FragmentState {
                     module: shaders.blocks_and_lines.get(),
-                    entry_point: "lines_fragment",
+                    entry_point: Some("lines_fragment"),
                     compilation_options: wgpu::PipelineCompilationOptions::default(),
                     targets: &[Some(wgpu::ColorTargetState {
                         format: fb.linear_scene_texture_format(),
@@ -378,13 +378,13 @@ impl Pipelines {
             ),
             vertex: wgpu::VertexState {
                 module: shaders.frame_copy.get(),
-                entry_point: "frame_copy_vertex",
+                entry_point: Some("frame_copy_vertex"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 buffers: &[],
             },
             fragment: Some(wgpu::FragmentState {
                 module: shaders.frame_copy.get(),
-                entry_point: "frame_copy_fragment",
+                entry_point: Some("frame_copy_fragment"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 targets: &[Some(wgpu::ColorTargetState {
                     format: wgpu::TextureFormat::Rgba16Float,
@@ -459,13 +459,13 @@ impl Pipelines {
             ),
             vertex: wgpu::VertexState {
                 module: shaders.rerun_copy.get(),
-                entry_point: "rerun_frame_copy_vertex",
+                entry_point: Some("rerun_frame_copy_vertex"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 buffers: &[],
             },
             fragment: Some(wgpu::FragmentState {
                 module: shaders.rerun_copy.get(),
-                entry_point: "rerun_frame_copy_fragment",
+                entry_point: Some("rerun_frame_copy_fragment"),
                 compilation_options: wgpu::PipelineCompilationOptions::default(),
                 targets: &[
                     Some(wgpu::ColorTargetState {
diff --git a/all-is-cubes-gpu/src/in_wgpu/postprocess.rs b/all-is-cubes-gpu/src/in_wgpu/postprocess.rs
index 545b416fb..6065ec565 100644
--- a/all-is-cubes-gpu/src/in_wgpu/postprocess.rs
+++ b/all-is-cubes-gpu/src/in_wgpu/postprocess.rs
@@ -90,13 +90,13 @@ pub(crate) fn create_postprocess_pipeline(
         layout: Some(&pipeline_layout),
         vertex: wgpu::VertexState {
             module: shaders.postprocess.get(),
-            entry_point: "postprocess_vertex",
+            entry_point: Some("postprocess_vertex"),
             compilation_options: wgpu::PipelineCompilationOptions::default(),
             buffers: &[],
         },
         fragment: Some(wgpu::FragmentState {
             module: shaders.postprocess.get(),
-            entry_point: "postprocess_fragment",
+            entry_point: Some("postprocess_fragment"),
             compilation_options: wgpu::PipelineCompilationOptions::default(),
             targets: &[Some(wgpu::ColorTargetState {
                 format: super::surface_view_format(surface_format),
diff --git a/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs b/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs
index 9b212b6d9..8e5d3d743 100644
--- a/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs
+++ b/all-is-cubes-gpu/src/in_wgpu/shader_testing.rs
@@ -96,13 +96,13 @@ where
         layout: Some(&pipelines.block_render_pipeline_layout),
         vertex: wgpu::VertexState {
             module: &shader,
-            entry_point: "block_vertex_main",
+            entry_point: Some("block_vertex_main"),
             compilation_options: wgpu::PipelineCompilationOptions::default(),
             buffers: &[WgpuBlockVertex::desc(), WgpuInstanceData::desc()],
         },
         fragment: Some(wgpu::FragmentState {
             module: &shader,
-            entry_point: "test_entry_point",
+            entry_point: Some("test_entry_point"),
             compilation_options: wgpu::PipelineCompilationOptions::default(),
             targets: &[Some(wgpu::ColorTargetState {
                 format: fbt.linear_scene_texture_format(),