Explicit index buffer format

Author: codebycruz

packages/arisu-app/plugin/render.lua

@@ -164,9 +164,9 @@ function RenderPlugin:draw(ctx)
 				op = {
 					type = "clear",
 					color = {
-						r = (math.sin(os.clock() * 10) + 1) / 2,
+						r = (math.sin(os.clock()) + 1) / 2,
 						g = 0,
-						b = (math.cos(os.clock() * 10) + 1) / 2,
+						b = (math.cos(os.clock()) + 1) / 2,
 						a = 1
 					}
 				},
@@ -178,26 +178,17 @@ function RenderPlugin:draw(ctx)
 	encoder:setBindGroup(0, self.sharedResources.bindGroup)
 	encoder:setViewport(0, 0, ctx.window.width, ctx.window.height)
 	encoder:setVertexBuffer(0, ctx.quadVertex)
-	encoder:setIndexBuffer(ctx.quadIndex)
-	encoder:drawIndexed(ctx.nIndices, 1)
+	encoder:setIndexBuffer(ctx.quadIndex, gfx.IndexType.u32)
+	encoder:drawIndexed(0, 1)
 	encoder:endRendering()
 
 	local commandBuffer = encoder:finish()
 	self.device.queue:submit(commandBuffer)
 
-	-- gl.enable(gl.BLEND)
-	-- gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
-
+	-- last things that need to be implemented
 	-- gl.enable(gl.DEPTH_TEST)
 	-- gl.depthFunc(gl.LESS_EQUAL)
 	-- gl.clear(bit.bor(gl.COLOR_BUFFER_BIT, gl.DEPTH_BUFFER_BIT))
-
-	-- gl.viewport(0, 0, ctx.window.width, ctx.window.height)
-
-	-- ctx.quadPipeline:bind()
-	-- self.sharedResources.textureManager:bind()
-	-- ctx.quadVAO:bind()
-	-- gl.drawElements(gl.TRIANGLES, ctx.nIndices, gl.UNSIGNED_INT, nil)
 end
 
 ---@param event winit.Event

packages/arisu-gfx/command_buffer/gl.lua

@@ -24,11 +24,26 @@ local function executeOp(op)
 	end
 end
 
+---@type table<gfx.gl.Context, gfx.gl.VAO>
+local vaos = setmetatable({}, {
+	__mode = "k",
+})
+
+---@type table<gfx.IndexFormat, number>
+local indexFormatToGL = {
+	[gfx.IndexType.u16] = gl.UNSIGNED_SHORT,
+	[gfx.IndexType.u32] = gl.UNSIGNED_INT,
+}
+
 function GLCommandBuffer:execute()
 	---@type gfx.gl.Pipeline?
 	local pipeline
-	local vao = GLVAO.new()
-	vao:bind()
+
+	--- TODO: absolutely cache the vao somewhere instead of recreating it every frame
+	---@type gfx.gl.VAO?
+	local vao
+
+	local indexType = gl.UNSIGNED_INT
 
 	for _, command in ipairs(self.commands) do
 		if command.type == "beginRendering" then
@@ -41,6 +56,15 @@ function GLCommandBuffer:execute()
 				end
 
 				texture.context:makeCurrent()
+				if not vaos[texture.context] then
+					local vao = GLVAO.new()
+					vaos[texture.context] = vao
+
+					print("created vao", vao.id)
+				end
+				vao = vaos[texture.context]
+				vao:bind()
+
 				gl.bindFramebuffer(gl.FRAMEBUFFER, texture.framebuffer)
 				executeOp(attachment.op)
 			end
@@ -68,13 +92,14 @@ function GLCommandBuffer:execute()
 			vao:setVertexBuffer(command.buffer, descriptor, command.slot)
 		elseif command.type == "setIndexBuffer" then
 			vao:setIndexBuffer(command.buffer)
+			indexType = indexFormatToGL[command.format]
 		elseif command.type == "writeBuffer" then
 			local buffer = command.buffer --[[@as gfx.gl.Buffer]]
 			buffer:setSlice(command.size, command.offset, command.data)
 		elseif command.type == "setBindGroup" then
 			-- I don't think this needs to exist for OpenGL
 		elseif command.type == "drawIndexed" then
-			gl.drawElements(gl.TRIANGLES, command.indexCount, gl.UNSIGNED_INT, nil)
+			gl.drawElements(gl.TRIANGLES, command.indexCount, indexType, nil)
 		else
 			print("Unknown command type: " .. tostring(command.type))
 		end

packages/arisu-gfx/command_encoder/gl.lua

@@ -5,7 +5,7 @@ local GLCommandBuffer = require("arisu-gfx.command_buffer.gl")
 ---| { type: "endRendering" }
 ---| { type: "setViewport", x: number, y: number, width: number, height: number }
 ---| { type: "setVertexBuffer", slot: number, buffer: gfx.gl.Buffer, offset: number }
----| { type: "setIndexBuffer", buffer: gfx.gl.Buffer, offset: number }
+---| { type: "setIndexBuffer", buffer: gfx.gl.Buffer, offset: number, format: gfx.IndexFormat }
 ---| { type: "setBindGroup", index: number, bindGroup: gfx.BindGroup }
 ---| { type: "setPipeline", pipeline: gfx.gl.Pipeline }
 ---| { type: "draw", vertexCount: number, instanceCount: number, firstVertex: number, firstInstance: number }
@@ -45,9 +45,10 @@ function GLCommandEncoder:setVertexBuffer(slot, buffer, offset)
 end
 
 ---@param buffer gfx.gl.Buffer
----@param offset number
-function GLCommandEncoder:setIndexBuffer(buffer, offset)
-	self.commands[#self.commands + 1] = { type = "setIndexBuffer", buffer = buffer, offset = offset or 0 }
+---@param format gfx.IndexFormat
+---@param offset number?
+function GLCommandEncoder:setIndexBuffer(buffer, format, offset)
+	self.commands[#self.commands + 1] = { type = "setIndexBuffer", buffer = buffer, format = format, offset = offset or 0 }
 end
 
 ---@param index number

packages/arisu-gfx/init.lua

@@ -48,4 +48,10 @@ gfx.CompareFunction = {
 	ALWAYS = 8,
 }
 
+---@enum gfx.IndexFormat
+gfx.IndexType = {
+	u16 = 1,
+	u32 = 2,
+}
+
 return gfx

packages/arisu-opengl/init.lua

@@ -158,6 +158,7 @@ return {
 
 	FLOAT = 0x1406,
 	UNSIGNED_INT = 0x1405,
+	UNSIGNED_SHORT = 0x1403,
 	INT = 0x1404,
 
 	TRIANGLES = 0x0004,

packages/arisu/init.lua

@@ -672,6 +672,14 @@ end
 ---@param event winit.Event
 ---@param handler winit.EventManager
 function App:event(event, handler)
+	-- handler:setMode("poll")
+
+	-- if event.name == "aboutToWait" then
+	-- 	for window in pairs(self.plugins.window.contexts) do
+	-- 		handler:requestRedraw(window)
+	-- 	end
+	-- end
+
 	local windowUpdate = self.plugins.window:event(event, handler)
 	if windowUpdate then
 		return windowUpdate