rework bindings

Author: malytomas

sources/include/cage-core/assetContext.h

@@ -29,10 +29,11 @@ namespace cage
 		Holder<PointerRange<char>> compressedData;
 		Holder<PointerRange<char>> originalData;
 		Holder<void> assetHolder;
+		const AssetsManager *const assetsManager = nullptr;
 		const uint32 assetId = 0;
 		uint32 scheme = m;
 
-		AssetContext(uint32 assetId) : assetId(assetId) {}
+		AssetContext(AssetsManager *assetsManager, uint32 assetId) : assetsManager(assetsManager), assetId(assetId) {}
 	};
 }
 

sources/include/cage-engine/graphicsBindings.h

@@ -0,0 +1,51 @@
+#ifndef guard_graphicsBindings_esdr41ttzu
+#define guard_graphicsBindings_esdr41ttzu
+
+#include <webgpu/webgpu_cpp.h>
+
+#include <cage-engine/core.h>
+
+namespace cage
+{
+	class GraphicsDevice;
+	class Texture;
+	class GpuBuffer;
+	class Model;
+
+	struct CAGE_ENGINE_API GpuBindings
+	{
+		wgpu::BindGroupLayout layout = {};
+		wgpu::BindGroup group = {};
+
+		operator bool() const
+		{
+			CAGE_ASSERT(!!layout == !!group);
+			return !!layout;
+		}
+	};
+
+	struct CAGE_ENGINE_API BindingsCreateConfig
+	{
+		struct TextureConfig
+		{
+			Texture *texture = nullptr;
+			uint32 binding = m;
+		};
+		std::vector<TextureConfig> textures;
+
+		struct BufferConfig
+		{
+			GpuBuffer *buffer = nullptr;
+			uint32 binding = m;
+			uint32 offset = 0;
+			uint32 size = m;
+		};
+		std::vector<BufferConfig> buffers;
+	};
+
+	CAGE_ENGINE_API GpuBindings newGpuBindings(GraphicsDevice *device, const BindingsCreateConfig &config);
+
+	CAGE_ENGINE_API void prepareModelBindings(GraphicsDevice *device, const AssetsManager *assets, Model *model);
+}
+
+#endif

sources/include/cage-engine/graphicsEncoder.h

@@ -5,13 +5,15 @@
 #include <optional>
 #include <vector>
 
-#include <cage-engine/core.h>
+#include <cage-engine/graphicsBindings.h>
 
+/*
 namespace wgpu
 {
 	class CommandEncoder;
 	class RenderPassEncoder;
 }
+*/
 
 namespace cage
 {
@@ -21,28 +23,7 @@ namespace cage
 	class Shader;
 	class Model;
 
-	struct CAGE_ENGINE_API BindingsConfig
-	{
-		struct TextureConfig
-		{
-			Texture *texture = nullptr;
-			uint32 shaderSet = m;
-			uint32 shaderBinding = m;
-		};
-		std::vector<TextureConfig> textures;
-
-		struct BufferConfig
-		{
-			GpuBuffer *buffer = nullptr;
-			uint32 shaderSet = m;
-			uint32 shaderBinding = m;
-			uint32 offset = 0;
-			uint32 size = m;
-		};
-		std::vector<BufferConfig> buffers;
-	};
-
-	struct CAGE_ENGINE_API PassConfig : public BindingsConfig
+	struct CAGE_ENGINE_API PassConfig
 	{
 		struct ColorTargetConfig
 		{
@@ -60,20 +41,19 @@ namespace cage
 		};
 		std::optional<DepthTargetConfig> depthTarget;
 
-		const char *label = nullptr;
+		GpuBindings bindings; // binds to set = 0
+
+		char *label = nullptr;
 	};
 
-	struct CAGE_ENGINE_API DrawConfig : public BindingsConfig
+	struct CAGE_ENGINE_API DrawConfig
 	{
 		Shader *shader = nullptr;
-		Model *model = nullptr;
-
+		Model *model = nullptr; // material binds to set = 1
+		GpuBindings bindings; // binds to set = 2
 		uint32 instances = 1;
 	};
 
-	// fills in all textures and material buffer from the model, using shader set = 1, and also fills in the shader
-	CAGE_ENGINE_API DrawConfig prepareDrawConfig(const AssetsManager *assets, Model *model, uint32 shaderKeywords = 0);
-
 	class CAGE_ENGINE_API GraphicsEncoder : private Immovable
 	{
 	public:

sources/include/cage-engine/model.h

@@ -18,6 +18,7 @@ namespace cage
 	class GraphicsDevice;
 	class GpuBuffer;
 	enum class MeshRenderFlags : uint32;
+	struct GpuBindings;
 
 	enum class MeshComponentsFlags : uint32
 	{
@@ -39,6 +40,7 @@ namespace cage
 
 		void updateLayout();
 		const wgpu::VertexBufferLayout &getLayout() const;
+		GpuBindings &bindings();
 
 		// general
 		Mat4 importTransform;