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(ptr_type ptr)
+    : m_pimpl(ptr)
+{
+}
+
+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"
+
+using namespace wgpu;
+
+namespace dawn_wrapper {
+
+struct bindgroup_set::pimpl {
+
+    void add_bindgroup(bindgroup_wrapper bg, unsigned group)
+    {
+        m_bindgroups[group] = bg;
+    }
+
+    pimpl(std::string context_name)
+        : m_bindgroups()
+        , m_context_name(context_name)
+    {
+    }
+
+private:
+    std::map<unsigned, bindgroup_wrapper> m_bindgroups;
+    std::string m_context_name;
+};
+
+}

src/compute_wrapper.cpp

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

src/compute_wrapper_impl.hpp

@@ -36,6 +36,14 @@ 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_set set, unsigned width, unsigned height, encoder_wrapper encoder)
+    {
+
+
+        return false;
+    }
+
+
     bool compute(bindgroup_wrapper bindGroup, unsigned width, unsigned height, encoder_wrapper encoder)
     {
         ASSERT(get_pipeline());

src/dawn_wrapper.hpp

@@ -87,11 +87,19 @@ struct bindgroup_wrapper {
     DAWN_WRAPPER_PIMPL_DEC(bindgroup_wrapper);
 };
 
+struct bindgroup_set {
+    bindgroup_set() = default;
+    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);
+    bool 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 +123,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

@@ -50,6 +50,12 @@ struct render_wrapper::pimpl : private shader_base {
         return m_surface.m_pimpl->getCurrentTextureView();
     }
 
+    void render(bindgroup_set set, encoder_wrapper encoder)
+    {
+
+
+    }
+
     void render(bindgroup_wrapper bindGroup, encoder_wrapper encoder)
     {
         ASSERT(m_bindGroupLayout);

test/build_and_run

@@ -2,6 +2,6 @@
 
 set -euo pipefail
 
-cmake -B build 
+#cmake -B build 
 cmake --build build -j 8 #$(nproc)
 ./build/Example