Rename EntryCollection to Entries and cleanup examples

Swoorup · Jul 6, 2024 · 7162a51 · 7162a51
1 parent 6a96213
commit 7162a51
Show file tree

Hide file tree

Showing 16 changed files with 584 additions and 734 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -0,0 +1 @@
+wgsl_bindgen/CHANGELOG.md
diff --git a/example/assets/more-shader-files/reachme.wgsl b/example/assets/more-shader-files/reachme.wgsl
diff --git a/example/build.rs b/example/build.rs
@@ -6,16 +6,16 @@ use wgsl_bindgen::{
 
 fn main() -> Result<()> {
     WgslBindgenOptionBuilder::default()
-        .workspace_root("assets/shader")
-        .add_entry_point("assets/shader/utils/testbed.wgsl")
-        .add_entry_point("assets/shader/triangle.wgsl")
+        .workspace_root("shaders")
+        .add_entry_point("shaders/testbed.wgsl")
+        .add_entry_point("shaders/triangle.wgsl")
         .skip_hash_check(true)
         .serialization_strategy(WgslTypeSerializeStrategy::Bytemuck)
         .type_map(GlamWgslTypeMap)
         .override_struct_field_type(
-            [("types::VectorsU32", "a", quote!(crate::MyTwoU32))].map(Into::into),
+            [("utils::types::VectorsU32", "a", quote!(crate::MyTwoU32))].map(Into::into),
         )
-        .add_override_struct_mapping(("types::Scalars", quote!(crate::MyScalars)))
+        .add_override_struct_mapping(("utils::types::Scalars", quote!(crate::MyScalars)))
         .add_custom_padding_field_regexp(Regex::new("_pad.*").unwrap())
         .short_constructor(2)
         .shader_source_type(

diff --git a/example/assets/shader/utils/testbed.wgsl → example/shaders/testbed.wgsl b/example/assets/shader/utils/testbed.wgsl → example/shaders/testbed.wgsl
@@ -1,13 +1,4 @@
-#import "../../more-shader-files/reachme" as reachme 
-#import types::{Scalars, VectorsU32, VectorsI32, VectorsF32, MatricesF32, StaticArrays, Nested}
-
-// The following also works
-// #import "../more-shader-files/reachme.wgsl" as reachme
-
-@group(2) @binding(1)
-// TODO: Fix this, I think the bug is in naga_oil.
-// var<storage> rts: array<reachme::rtsStruct>;
-var<storage> rts: reachme::rtsStruct;
+#import utils::types::{Scalars, VectorsU32, VectorsI32, VectorsF32, MatricesF32, StaticArrays, Nested}
 
 @group(2) @binding(2)
 var<storage> a: Scalars;

diff --git a/example/assets/shader/triangle.wgsl → example/shaders/triangle.wgsl b/example/assets/shader/triangle.wgsl → example/shaders/triangle.wgsl
diff --git a/example/assets/shader/types.wgsl → example/shaders/utils/types.wgsl b/example/assets/shader/types.wgsl → example/shaders/utils/types.wgsl
diff --git a/example/src/main.rs b/example/src/main.rs
@@ -147,8 +147,8 @@ impl State {
         // Use the generated types to ensure the correct bind group is assigned to each slot.
         let bind_group0 = shader_bindings::triangle::WgpuBindGroup0::from_bindings(
             &device,
-            shader_bindings::triangle::WgpuBindGroup0EntryCollection::new(
-                shader_bindings::triangle::WgpuBindGroup0EntryCollectionParams {
+            shader_bindings::triangle::WgpuBindGroup0Entries::new(
+                shader_bindings::triangle::WgpuBindGroup0EntriesParams {
                     color_texture: &view,
                     color_sampler: &sampler,
                 },
@@ -165,8 +165,8 @@ impl State {
 
         let bind_group1 = shader_bindings::triangle::WgpuBindGroup1::from_bindings(
             &device,
-            shader_bindings::triangle::WgpuBindGroup1EntryCollection::new(
-                shader_bindings::triangle::WgpuBindGroup1EntryCollectionParams {
+            shader_bindings::triangle::WgpuBindGroup1Entries::new(
+                shader_bindings::triangle::WgpuBindGroup1EntriesParams {
                     uniforms: uniforms_buffer.as_entire_buffer_binding(),
                 },
             ),