Properly bind bindgroups

Author: codebycruz

packages/arisu-gfx/bind_group.lua

@@ -11,7 +11,7 @@ BindGroup.__index = BindGroup
 ---@alias gfx.BindGroupEntry
 --- | { type: "buffer", binding: number, buffer: gfx.Buffer, visibility: gfx.ShaderStage[] }
 --- | { type: "sampler", binding: number, sampler: gfx.Sampler, visibility: gfx.ShaderStage[] }
---- | { type: "texture", binding: number, textureView: gfx.Texture, visibility: gfx.ShaderStage[] }
+--- | { type: "texture", binding: number, texture: gfx.Texture, visibility: gfx.ShaderStage[] }
 
 ---@param entries gfx.BindGroupEntry[]
 function BindGroup.new(entries)

packages/arisu-gfx/buffer/gl.lua

@@ -15,7 +15,7 @@ function GLBuffer.new(descriptor)
 
 	local isUniform = false
 	for _, usage in ipairs(descriptor.usages) do
-		if usage == "uniform" then
+		if usage == "UNIFORM" then
 			isUniform = true
 			break
 		end

packages/arisu-gfx/command_buffer/gl.lua

@@ -97,7 +97,22 @@ function GLCommandBuffer:execute()
 			local buffer = command.buffer --[[@as gfx.gl.Buffer]]
 			buffer:setSlice(command.size, command.data, command.offset)
 		elseif command.type == "setBindGroup" then
-			-- I don't think this needs to exist for OpenGL
+			for _, entry in ipairs(command.bindGroup.entries) do
+				if entry.type == "buffer" then
+					local buffer = entry.buffer --[[@as gfx.gl.Buffer]]
+					if buffer.isUniform then
+						gl.bindBufferBase(gl.UNIFORM_BUFFER, entry.binding, buffer.id)
+					else
+						error("Only uniform buffers are supported in bind groups for now")
+					end
+				elseif entry.type == "texture" then
+					local texture = entry.texture --[[@as gfx.gl.Texture]]
+					gl.bindTextureUnit(entry.binding, texture.id)
+				elseif entry.type == "sampler" then
+					local sampler = entry.sampler --[[@as gfx.gl.Sampler]]
+					gl.bindSampler(entry.binding, sampler.id)
+				end
+			end
 		elseif command.type == "drawIndexed" then
 			gl.drawElements(gl.TRIANGLES, command.indexCount, indexType, nil)
 		else

packages/arisu/gl/texture_manager.lua

@@ -5,6 +5,7 @@ local gl = require("arisu-opengl")
 local gfx = require("arisu-gfx")
 
 local Image = require("arisu-image")
+local Texture = require("arisu-gfx.texture.gl")
 
 local maxWidth = 1024
 local maxHeight = 1024
@@ -177,16 +178,19 @@ end
 function TextureManager:createBindGroup(binding, samplerBinding, dimsBinding)
 	return self.device:createBindGroup({
 		{
+			type = "texture",
 			binding = binding,
-			texture = self.textureHandle,
+			texture = Texture.new(0, self.textureHandle),
 			visibility = { "FRAGMENT" },
 		},
 		{
+			type = "sampler",
 			binding = samplerBinding,
 			sampler = self.sampler,
 			visibility = { "FRAGMENT" },
 		},
 		{
+			type = "buffer",
 			binding = dimsBinding,
 			buffer = self.textureDimsBuffer,
 			visibility = { "FRAGMENT" },