Dev bindgroup set (#22)

* rm dawn again

* add dawn

* dawn/.gitignore

* rm dawn

* add dawn without .gitignore

* add lib dawn without gitignore file

* rm fucking dawn

* dawn without .gitignore

* fetch dawn

* invoke fetch_dawn

* fix up fetch_dawn with cmake

* ignore lib/dawn

* try cache build folder

* try cache dawn instead

* try to cache dawn build folder

* dont remove build folder

* move bindgroup factory method into bindgroup layout

* try vendoring dawn code

* try to fetch deps

* disable fetch from cmake

* vendor dawn code

* update dawn fetch script

* cleanup

---------

Co-authored-by: mucbuc <mucbuc@mucbucs-Mac-mini-2.local>

Author: mucbuc

.github/workflows/build.yml

@@ -16,9 +16,18 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      - name: Cache Build Folder
+        uses: actions/cache@v4
+        with:
+          path: |
+            lib/dawn  
+            test/build/lib/dawn_wrapper/lib/dawn
+          key: ${{ runner.os }}-build-${{ hashFiles('lib/fetch_dawn.sh') }}
+          restore-keys: |
+            ${{ runner.os }}-build-
+
       - name: Build and run
         run: |
           cd test
-          rm -rf build
           ./build_and_run
 

lib/fetch_dawn.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
 
+#version bumper1 
 
 if [ ! -d "dawn" ]; then
   git clone --depth 1 --branch chromium/7780 https://dawn.googlesource.com/dawn

src/bindgroup_layout_wrapper.cpp

@@ -3,6 +3,7 @@
 #include <memory>
 
 #include "bindgroup_layout_wrapper_impl.hpp"
+#include "bindgroup_wrapper_impl.hpp"
 
 struct GLFWwindow;
 
@@ -54,4 +55,9 @@ bindgroup_layout_wrapper& bindgroup_layout_wrapper::add_sampler(unsigned binding
     return *this;
 }
 
+bindgroup_wrapper bindgroup_layout_wrapper::make_bindgroup()
+{
+    return std::make_shared<bindgroup_wrapper::pimpl>(* this, m_pimpl->m_context_name);
+}
+
 } // dawn_wrapper

src/bindgroup_layout_wrapper_impl.hpp

@@ -7,8 +7,11 @@ using namespace wgpu;
 namespace dawn_wrapper {
 
 struct bindgroup_layout_wrapper::pimpl {
-    pimpl(ShaderStage stage)
+    pimpl(ShaderStage stage, std::string context_name)
         : m_stage(stage)
+        , m_layoutEntries()
+        , m_bindGroupLayout()
+        , m_context_name(context_name)
     {
     }
 
@@ -61,6 +64,15 @@ struct bindgroup_layout_wrapper::pimpl {
         }
     }
 
+    BindGroupLayout make_bindGroupLayout(Device device, std::string label)
+    {
+        if (!m_bindGroupLayout) {
+            m_bindGroupLayout = dawn_utils::make_bindGroupLayout(device, m_layoutEntries, label.c_str());
+        }
+        return m_bindGroupLayout;
+    }
+
+
     BindGroupLayoutEntry make_texture_layout_entry(unsigned binding, TextureSampleType type = TextureSampleType::Float, TextureViewDimension dimension = TextureViewDimension::e1D)
     {
 
@@ -96,6 +108,8 @@ struct bindgroup_layout_wrapper::pimpl {
 
     ShaderStage m_stage;
     std::vector<BindGroupLayoutEntry> m_layoutEntries;
+    BindGroupLayout m_bindGroupLayout;
+    std::string m_context_name;
 };
 
 }

src/bindgroup_wrapper_impl.hpp

@@ -3,6 +3,7 @@
 #include "buffer_wrapper_impl.hpp"
 #include "texture_output_wrapper_impl.hpp"
 #include "texture_wrapper_impl.hpp"
+#include "bindgroup_layout_wrapper_impl.hpp"
 
 using namespace wgpu;
 
@@ -54,25 +55,28 @@ struct bindgroup_wrapper::pimpl {
         }
     }
 
-    BindGroup make_bindgroup(Device device, BindGroupLayout layout)
+    BindGroup make_bindgroup(Device device)
     {
         if (!m_bindgroup) {
+            auto layout = m_layout.m_pimpl->make_bindGroupLayout(device, m_context_name.c_str());
             m_bindgroup = dawn_utils::make_bindGroup(device, layout, m_bindgroup_entries, m_context_name.c_str());
         }
         return m_bindgroup;
     }
 
-    pimpl(std::string context_name)
+    pimpl(bindgroup_layout_wrapper layout, std::string context_name)
         : m_bindgroup_entries()
         , m_context_name(context_name)
         , m_bindgroup()
+        , m_layout(layout)
     {
     }
 
 private:
     std::vector<BindGroupEntry> m_bindgroup_entries;
     std::string m_context_name;
     BindGroup m_bindgroup;
+    bindgroup_layout_wrapper m_layout;
 };
 
 }

src/compute_wrapper.cpp

@@ -32,11 +32,6 @@ bindgroup_layout_wrapper compute_wrapper::make_bindgroup_layout()
     return m_pimpl->make_bindgroup_layout();
 }
 
-bindgroup_wrapper compute_wrapper::make_bindgroup()
-{
-    return m_pimpl->make_bindgroup();
-}
-
 bool compute_wrapper::is_valid() const
 {
     return m_pimpl ? true : false;

src/compute_wrapper_impl.hpp

@@ -32,7 +32,7 @@ struct compute_wrapper::pimpl : private shader_base {
 
     void init_pipeline(bindgroup_layout_wrapper layout)
     {
-        m_bindGroupLayout = dawn_utils::make_bindGroupLayout(m_device, layout.m_pimpl->m_layoutEntries, m_entryPoint.c_str());
+        m_bindGroupLayout = layout.m_pimpl->make_bindGroupLayout(m_device, m_entryPoint.c_str());
         m_pipeline = dawn_utils::make_compute_pipeline(m_device, m_shader, m_bindGroupLayout, m_entryPoint.c_str());
     }
 
@@ -44,7 +44,7 @@ struct compute_wrapper::pimpl : private shader_base {
 
         auto computePass = dawn_utils::begin_compute_pass(encoder.m_pimpl->m_encoder);
         computePass.SetPipeline(get_pipeline());
-        computePass.SetBindGroup(0, bindGroup.m_pimpl->make_bindgroup(m_device, m_bindGroupLayout), 0, nullptr);
+        computePass.SetBindGroup(0, bindGroup.m_pimpl->make_bindgroup(m_device), 0, nullptr);
         computePass.DispatchWorkgroups(width, height, 1);
         computePass.End();
 
@@ -63,12 +63,7 @@ struct compute_wrapper::pimpl : private shader_base {
 
     bindgroup_layout_wrapper make_bindgroup_layout()
     {
-        return std::make_shared<bindgroup_layout_wrapper::pimpl>(ShaderStage::Compute);
-    }
-
-    bindgroup_wrapper make_bindgroup()
-    {
-        return std::make_shared<bindgroup_wrapper::pimpl>(m_entryPoint);
+        return std::make_shared<bindgroup_layout_wrapper::pimpl>(ShaderStage::Compute, m_entryPoint);
     }
 
     Device m_device;

src/dawn_wrapper.hpp

@@ -60,6 +60,7 @@ struct texture_output_wrapper {
     DAWN_WRAPPER_PIMPL_DEC(texture_output_wrapper);
 };
 
+struct bindgroup_wrapper;
 struct bindgroup_layout_wrapper {
     bindgroup_layout_wrapper() = default;
     bindgroup_layout_wrapper& add_buffer(unsigned binding, bool enable = true);
@@ -69,11 +70,13 @@ struct bindgroup_layout_wrapper {
     bindgroup_layout_wrapper& add_texture_2d(unsigned binding, bool enable = true);
     bindgroup_layout_wrapper& add_storage_texture_2d(unsigned binding, bool enable = true);
     bindgroup_layout_wrapper& add_sampler(unsigned binding, bool enable = true);
+    bindgroup_wrapper make_bindgroup();
     DAWN_WRAPPER_PIMPL_DEC(bindgroup_layout_wrapper);
 };
 
 struct bindgroup_wrapper {
-    bindgroup_wrapper() = default;
+    bindgroup_wrapper() = delete;//default;
+    bindgroup_wrapper(bindgroup_layout_wrapper);
     bindgroup_wrapper& add_buffer(unsigned binding, buffer_wrapper);
     bindgroup_wrapper& add_texture(unsigned binding, texture_wrapper);
     bindgroup_wrapper& add_texture(unsigned binding, texture_output_wrapper);
@@ -91,7 +94,6 @@ struct compute_wrapper {
     bool compute(bindgroup_wrapper, unsigned width, unsigned height, encoder_wrapper encoder);
     void setup_compute(unsigned width, unsigned height);
     bindgroup_layout_wrapper make_bindgroup_layout();
-    bindgroup_wrapper make_bindgroup();
     bool is_valid() const;
     DAWN_WRAPPER_PIMPL_DEC(compute_wrapper);
 };
@@ -116,7 +118,6 @@ struct render_wrapper {
     void render(bindgroup_wrapper, encoder_wrapper);
     void render(encoder_wrapper);
     bindgroup_layout_wrapper make_bindgroup_layout();
-    bindgroup_wrapper make_bindgroup();
     void init_pipeline(bindgroup_layout_wrapper);
     void init_pipeline();
     bool is_valid() const;

src/render_wrapper.cpp

@@ -28,11 +28,6 @@ bindgroup_layout_wrapper render_wrapper::make_bindgroup_layout()
     return m_pimpl->make_bindgroup_layout();
 }
 
-bindgroup_wrapper render_wrapper::make_bindgroup()
-{
-    return m_pimpl->make_bindgroup();
-}
-
 void render_wrapper::init_pipeline(bindgroup_layout_wrapper layout)
 {
     m_pimpl->init_pipeline(layout);

src/render_wrapper_impl.hpp

@@ -61,7 +61,7 @@ struct render_wrapper::pimpl : private shader_base {
         auto pass = dawn_utils::begin_render_pass(encoder.m_pimpl->m_encoder, textureView);
         pass.SetPipeline(get_pipeline());
 
-        auto bindGroupImpl = bindGroup.m_pimpl->make_bindgroup(m_device, m_bindGroupLayout);
+        auto bindGroupImpl = bindGroup.m_pimpl->make_bindgroup(m_device);
         pass.SetBindGroup(0, bindGroupImpl);
 
         pass.SetVertexBuffer(0, get_bufferVertex(), 0, get_bufferVertex().GetSize());
@@ -93,12 +93,7 @@ struct render_wrapper::pimpl : private shader_base {
 
     bindgroup_layout_wrapper make_bindgroup_layout()
     {
-        return std::make_shared<bindgroup_layout_wrapper::pimpl>(ShaderStage::Fragment);
-    }
-
-    bindgroup_wrapper make_bindgroup()
-    {
-        return std::make_shared<bindgroup_wrapper::pimpl>(m_entryPoint);
+        return std::make_shared<bindgroup_layout_wrapper::pimpl>(ShaderStage::Fragment, m_entryPoint);
     }
 
     void compile_shader(std::string script, std::string entryPoint)
@@ -112,7 +107,7 @@ struct render_wrapper::pimpl : private shader_base {
     {
         ASSERT(m_shader);
 
-        m_bindGroupLayout = dawn_utils::make_bindGroupLayout(m_device, layout.m_pimpl->m_layoutEntries, m_entryPoint.c_str());
+        m_bindGroupLayout = layout.m_pimpl->make_bindGroupLayout(m_device, m_entryPoint.c_str());
         m_pipeline = dawn_utils::make_render_pipeline(m_device, m_bindGroupLayout, m_shader, m_vertexShader, m_entryPoint.c_str());
     }