Dev bindgroup set

CMakeLists.txt

@@ -14,6 +14,8 @@ set_target_properties(dawn_wrapper PROPERTIES
 target_sources(dawn_wrapper PRIVATE
     src/bindgroup_layout_wrapper.cpp
     src/bindgroup_layout_wrapper_impl.hpp
+    src/bindgroup_set.cpp
+    src/bindgroup_set_impl.hpp
     src/bindgroup_wrapper.cpp
     src/bindgroup_wrapper_impl.hpp
     src/buffer_wrapper.cpp

src/bindgroup_set.cpp

@@ -0,0 +1,19 @@
+#include <iostream>
+#include <map>
+#include <memory>
+
+#include "bindgroup_set_impl.hpp"
+
+namespace dawn_wrapper {
+bindgroup_set::bindgroup_set()
+    : m_pimpl(std::make_shared<bindgroup_set::pimpl>())
+{
+}
+
+bindgroup_set& bindgroup_set::add_bindgroup(bindgroup_wrapper bg, unsigned group)
+{
+    m_pimpl->add_bindgroup(bg, group);
+    return *this;
+}
+
+} // dawn_wrapper

src/bindgroup_set_impl.hpp

@@ -0,0 +1,29 @@
+#pragma once
+
+#include "buffer_wrapper_impl.hpp"
+#include "texture_output_wrapper_impl.hpp"
+#include "texture_wrapper_impl.hpp"
+
+#include <map>
+#include <string>
+
+using namespace wgpu;
+
+namespace dawn_wrapper {
+
+struct bindgroup_set::pimpl {
+
+    void add_bindgroup(bindgroup_wrapper bg, unsigned group)
+    {
+        m_bindgroups[group] = bg;
+    }
+
+    pimpl()
+        : m_bindgroups()
+    {
+    }
+
+    std::map<unsigned, bindgroup_wrapper> m_bindgroups;
+};
+
+}

src/compute_wrapper.cpp

@@ -22,9 +22,14 @@ void compute_wrapper::init_pipeline(bindgroup_layout_wrapper layout)
     m_pimpl->init_pipeline(layout);
 }
 
-bool compute_wrapper::compute(bindgroup_wrapper bindGroup, unsigned width, unsigned height, encoder_wrapper encoder)
+void compute_wrapper::compute(bindgroup_set set, unsigned width, unsigned height, encoder_wrapper encoder)
 {
-    return m_pimpl->compute(bindGroup, width, height, encoder);
+    m_pimpl->compute(set, width, height, encoder);
+}
+
+void compute_wrapper::compute(bindgroup_wrapper bindGroup, unsigned width, unsigned height, encoder_wrapper encoder)
+{
+    m_pimpl->compute(bindGroup, width, height, encoder);
 }
 
 bindgroup_layout_wrapper compute_wrapper::make_bindgroup_layout()

src/compute_wrapper_impl.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "bindgroup_layout_wrapper_impl.hpp"
+#include "bindgroup_set_impl.hpp"
 #include "bindgroup_wrapper_impl.hpp"
 #include "buffer_wrapper_impl.hpp"
 #include "dawn_utils.hpp"
@@ -36,29 +37,42 @@ struct compute_wrapper::pimpl : private shader_base {
         m_pipeline = dawn_utils::make_compute_pipeline(m_device, m_shader, m_bindGroupLayout, m_entryPoint.c_str());
     }
 
-    bool compute(bindgroup_wrapper bindGroup, unsigned width, unsigned height, encoder_wrapper encoder)
+    void compute(bindgroup_set set, unsigned width, unsigned height, encoder_wrapper encoder)
     {
         ASSERT(get_pipeline());
         ASSERT(width < 65535);
         ASSERT(height < 65535);
 
         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), 0, nullptr);
+
+        for (auto entry : set.m_pimpl->m_bindgroups)
+        {
+            ASSERT(entry.second.m_pimpl);
+            computePass.SetBindGroup(entry.first, entry.second.m_pimpl->make_bindgroup(m_device));
+        }
+
         computePass.DispatchWorkgroups(width, height, 1);
         computePass.End();
-
-        return false;
     }
 
-    ComputePipeline get_pipeline()
+
+    void compute(bindgroup_wrapper bindGroup, unsigned width, unsigned height, encoder_wrapper encoder)
     {
-        return m_pipeline;
+        ASSERT(get_pipeline());
+        ASSERT(width < 65535);
+        ASSERT(height < 65535);
+
+        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), 0, nullptr);
+        computePass.DispatchWorkgroups(width, height, 1);
+        computePass.End();
     }
 
-    BindGroupLayout get_bindGroupLayout()
+    ComputePipeline get_pipeline()
     {
-        return m_bindGroupLayout;
+        return m_pipeline;
     }
 
     bindgroup_layout_wrapper make_bindgroup_layout()

src/dawn_wrapper.hpp

@@ -9,16 +9,17 @@ namespace dawn_wrapper {
 
 #define DAWN_WRAPPER_PIMPL_DEC(class_name)   \
 private:                                     \
-    friend class render_wrapper;             \
-    friend class compute_wrapper;            \
-    friend class dawn_plugin;                \
-    friend class texture_wrapper;            \
-    friend class texture_output_wrapper;     \
+    friend class bindgroup_layout_wrapper;   \
+    friend class bindgroup_set;              \
     friend class bindgroup_wrapper;          \
     friend class buffer_wrapper;             \
-    friend class bindgroup_layout_wrapper;   \
+    friend class compute_wrapper;            \
+    friend class dawn_plugin;                \
     friend class encoder_wrapper;            \
+    friend class render_wrapper;             \
     friend class surface_wrapper;            \
+    friend class texture_output_wrapper;     \
+    friend class texture_wrapper;            \
     struct pimpl;                            \
     using ptr_type = std::shared_ptr<pimpl>; \
     class_name(ptr_type);                    \
@@ -87,11 +88,19 @@ struct bindgroup_wrapper {
     DAWN_WRAPPER_PIMPL_DEC(bindgroup_wrapper);
 };
 
+struct bindgroup_set {
+    bindgroup_set();
+    bindgroup_set& add_bindgroup(bindgroup_wrapper bg, unsigned group);
+
+    DAWN_WRAPPER_PIMPL_DEC(bindgroup_set);
+};
+
 struct compute_wrapper {
     compute_wrapper() = default;
     void init_pipeline(bindgroup_layout_wrapper layout);
     void compile_shader(std::string script, std::string entryPoint);
-    bool compute(bindgroup_wrapper, unsigned width, unsigned height, encoder_wrapper encoder);
+    void compute(bindgroup_wrapper, unsigned width, unsigned height, encoder_wrapper encoder);
+    void compute(bindgroup_set, unsigned width, unsigned height, encoder_wrapper encoder);
     void setup_compute(unsigned width, unsigned height);
     bindgroup_layout_wrapper make_bindgroup_layout();
     bool is_valid() const;
@@ -115,6 +124,7 @@ struct render_wrapper {
     void compile_shader(std::string script, std::string entryPoint);
     void set_surface(surface_wrapper);
 
+    void render(bindgroup_set, encoder_wrapper);
     void render(bindgroup_wrapper, encoder_wrapper);
     void render(encoder_wrapper);
     bindgroup_layout_wrapper make_bindgroup_layout();

src/render_wrapper.cpp

@@ -38,6 +38,11 @@ void render_wrapper::init_pipeline()
     m_pimpl->init_pipeline();
 }
 
+void render_wrapper::render(bindgroup_set set, encoder_wrapper encoder)
+{
+    m_pimpl->render(set, encoder);
+}
+
 void render_wrapper::render(bindgroup_wrapper bindGroup, encoder_wrapper encoder)
 {
     m_pimpl->render(bindGroup, encoder);

src/render_wrapper_impl.hpp

@@ -1,6 +1,7 @@
 #pragma once
 
 #include "bindgroup_layout_wrapper_impl.hpp"
+#include "bindgroup_set_impl.hpp"
 #include "bindgroup_wrapper_impl.hpp"
 #include "encoder_wrapper_impl.hpp"
 #include "shader_base.hpp"
@@ -50,6 +51,32 @@ struct render_wrapper::pimpl : private shader_base {
         return m_surface.m_pimpl->getCurrentTextureView();
     }
 
+    void render(bindgroup_set set, encoder_wrapper encoder)
+    {
+        auto textureView = getCurrentTextureView();
+        ASSERT(textureView);
+
+        auto pass = dawn_utils::begin_render_pass(encoder.m_pimpl->m_encoder, textureView);
+        pass.SetPipeline(get_pipeline());
+
+        for (auto entry : set.m_pimpl->m_bindgroups)
+        {
+            ASSERT(entry.second.m_pimpl); 
+
+            pass.SetBindGroup(entry.first, entry.second.m_pimpl->make_bindgroup(m_device));
+        }
+
+        pass.SetVertexBuffer(0, get_bufferVertex(), 0, get_bufferVertex().GetSize());
+        pass.SetIndexBuffer(get_bufferIndex(), IndexFormat::Uint16, 0, get_bufferIndex().GetSize());
+        pass.DrawIndexed(3, 1, 0, 0, 0);
+        pass.End();
+
+        encoder.submit_command_buffer();
+#ifndef __EMSCRIPTEN__
+        m_surface.present();
+#endif
+    }
+
     void render(bindgroup_wrapper bindGroup, encoder_wrapper encoder)
     {
         ASSERT(m_bindGroupLayout);
@@ -123,11 +150,6 @@ struct render_wrapper::pimpl : private shader_base {
         return m_pipeline;
     }
 
-    BindGroupLayout get_bindGroupLayout()
-    {
-        return m_bindGroupLayout;
-    }
-
     Buffer get_bufferVertex()
     {
         return m_bufferVertex;