More abstractions

codebycruz · codebycruz · commit 46ff72336a2b · 2025-12-13T17:36:13.000-08:00
diff --git a/packages/arisu-app/plugin/render.lua b/packages/arisu-app/plugin/render.lua
@@ -9,11 +9,11 @@ local UniformBlock = require("arisu.gl.uniform_block")
 local TextureManager = require("arisu.gl.texture_manager")
 local FontManager = require("arisu.gl.font_manager")
 
-local Device = require("arisu-gfx.device.gl")
+local Instance = require("arisu-gfx.instance")
 
 ---@class arisu.plugin.Render.Context
 ---@field window winit.Window
----@field renderCtx gfx.Context
+---@field surface gfx.gl.Surface
 ---@field quadVAO VAO
 ---@field quadPipeline Pipeline
 ---@field quadVertex gfx.Buffer
@@ -42,12 +42,17 @@ local Device = require("arisu-gfx.device.gl")
 ---@field mainCtx arisu.plugin.Render.Context?
 ---@field contexts table<winit.Window, arisu.plugin.Render.Context>
 ---@field sharedResources arisu.plugin.Render.SharedResources?
+---@field device gfx.Device
 local RenderPlugin = {}
 RenderPlugin.__index = RenderPlugin
 
 ---@param windowPlugin arisu.plugin.Window
 function RenderPlugin.new(windowPlugin)
-	return setmetatable({ contexts = {}, windowPlugin = windowPlugin }, RenderPlugin)
+	local instance = Instance.new()
+	local adapter = instance:requestAdapter({ powerPreference = "high-performance" })
+	local device = adapter:requestDevice()
+
+	return setmetatable({ device = device, contexts = {}, windowPlugin = windowPlugin }, RenderPlugin)
 end
 
 ---@param window winit.Window
@@ -65,26 +70,23 @@ function RenderPlugin:register(window)
 	local ctx = self.windowPlugin:getContext(window)
 	assert(ctx, "Window context not found for render plugin")
 
-	ctx.renderCtx:makeCurrent()
-
-	-- todo: dont make this here
-	local device = Device.new()
+	ctx.surface.context:makeCurrent()
 
 	local vertexDescriptor = VertexLayout.new()
 		:withAttribute({ type = "f32", size = 3, offset = 0 }) -- position (vec3)
 		:withAttribute({ type = "f32", size = 4, offset = 12 }) -- color (rgba)
 		:withAttribute({ type = "f32", size = 2, offset = 28 }) -- uv
 		:withAttribute({ type = "f32", size = 1, offset = 36 }) -- texture id
 
-	local quadVertex = device:createBuffer({ size = vertexDescriptor:getStride() * 1000, usages = { "VERTEX" } })
-	local quadIndex = device:createBuffer({ size = util.sizeof("u16") * 1000, usages = { "INDEX" } })
+	local quadVertex = self.device:createBuffer({ size = vertexDescriptor:getStride() * 1000, usages = { "VERTEX" } })
+	local quadIndex = self.device:createBuffer({ size = util.sizeof("u16") * 1000, usages = { "INDEX" } })
 
 	local quadVAO = VAO.new()
 	quadVAO:setVertexBuffer(quadVertex, vertexDescriptor)
 	quadVAO:setIndexBuffer(quadIndex)
 
-	local overlayVertex = device:createBuffer({ size = vertexDescriptor:getStride() * 1000, usages = { "VERTEX" } })
-	local overlayIndex = device:createBuffer({ size = util.sizeof("u16") * 1000, usages = { "INDEX" } })
+	local overlayVertex = self.device:createBuffer({ size = vertexDescriptor:getStride() * 1000, usages = { "VERTEX" } })
+	local overlayIndex = self.device:createBuffer({ size = util.sizeof("u16") * 1000, usages = { "INDEX" } })
 
 	local overlayVertexDescriptor = VertexLayout.new()
 		:withAttribute({ type = "f32", size = 3, offset = 0 }) -- position (vec3)
@@ -137,7 +139,7 @@ function RenderPlugin:register(window)
 	---@type arisu.plugin.Render.Context
 	local ctx = {
 		window = window,
-		renderCtx = ctx.renderCtx,
+		surface = ctx.surface,
 		quadVAO = quadVAO,
 		quadPipeline = quadPipeline,
 		quadVertex = quadVertex,
@@ -160,7 +162,7 @@ end
 
 ---@param ctx arisu.plugin.Render.Context
 function RenderPlugin:draw(ctx)
-	ctx.renderCtx:makeCurrent()
+	ctx.surface.context:makeCurrent()
 
 	gl.enable(gl.BLEND)
 	gl.blendFunc(gl.SRC_ALPHA, gl.ONE_MINUS_SRC_ALPHA)
@@ -182,7 +184,7 @@ end
 function RenderPlugin:event(event, handler)
 	if event.name == "resize" then
 		local ctx = self:getContext(event.window)
-		ctx.renderCtx:makeCurrent()
+		ctx.surface.context:makeCurrent()
 		gl.viewport(0, 0, ctx.window.width, ctx.window.height)
 
 		if util.isWindows() then
diff --git a/packages/arisu-app/plugin/window.lua b/packages/arisu-app/plugin/window.lua
@@ -1,8 +1,8 @@
-local Context = require("arisu-gfx")
+local Surface = require("arisu-gfx.surface")
 
 ---@class arisu.plugin.Window.Context
 ---@field window winit.Window
----@field renderCtx gfx.Context
+---@field surface gfx.gl.Surface
 
 ---@class arisu.plugin.Window<Message>: { onWindowCreate: Message }
 ---@field mainCtx arisu.plugin.Window.Context?
@@ -18,17 +18,14 @@ end
 
 ---@param window winit.Window
 function WindowPlugin:register(window)
-	local renderCtx = Context.new(window, self.mainCtx and self.mainCtx.renderCtx)
+	local surface = Surface.new(window)
 
 	local windowCtx = {
 		window = window,
-		renderCtx = renderCtx
+		surface = surface
 	}
 
-	if not self.mainCtx then
-		self.mainCtx = windowCtx
-	end
-
+	self.mainCtx = self.mainCtx or windowCtx
 	self.contexts[window] = windowCtx
 end
 
diff --git a/packages/arisu-gfx/adapter.lua b/packages/arisu-gfx/adapter.lua
@@ -0,0 +1,8 @@
+---@class gfx.AdapterConfig
+---@field powerPreference? "low-power" | "high-performance"
+
+---@class gfx.Adapter
+---@field requestDevice fun(self: gfx.Adapter): gfx.Device
+local Adapter = require("arisu-gfx.adapter.gl") --[[@as gfx.Adapter]]
+
+return Adapter
diff --git a/packages/arisu-gfx/adapter/gl.lua b/packages/arisu-gfx/adapter/gl.lua
@@ -0,0 +1,16 @@
+local GLDevice = require("arisu-gfx.device.gl")
+
+---@class gfx.gl.Adapter
+local GLAdapter = {}
+GLAdapter.__index = GLAdapter
+
+---@param config gfx.AdapterConfig
+function GLAdapter.new(config)
+	return setmetatable({ config = config }, GLAdapter)
+end
+
+function GLAdapter:requestDevice()
+	return GLDevice.new()
+end
+
+return GLAdapter
diff --git a/packages/arisu-gfx/adapter/vk.lua b/packages/arisu-gfx/adapter/vk.lua
diff --git a/packages/arisu-gfx/init.lua b/packages/arisu-gfx/init.lua
@@ -1,14 +1 @@
-local util = require("arisu-util")
-
 ---@alias gfx.Color { r: number, g: number, b: number, a: number }
-
----@class gfx.Context
----@field new fun(window: winit.Window, sharedCtx: gfx.Context?): gfx.Context
----@field makeCurrent fun(self: gfx.Context): boolean
----@field swapBuffers fun(self: gfx.Context)
----@field destroy fun(self: gfx.Context)
-local Context = util.isWindows()
-	and require("arisu-gfx.context.win32")
-	or require("arisu-gfx.context.x11") --[[@as gfx.Context]]
-
-return Context
diff --git a/packages/arisu-gfx/instance.lua b/packages/arisu-gfx/instance.lua
@@ -0,0 +1,6 @@
+---@class gfx.Instance
+---@field new fun(): gfx.Instance
+---@field requestAdapter fun(self: gfx.Instance, options: gfx.AdapterOptions?): gfx.Adapter
+local Instance = require("arisu-gfx.instance.gl") --[[@as gfx.Instance]]
+
+return Instance
diff --git a/packages/arisu-gfx/instance/gl.lua b/packages/arisu-gfx/instance/gl.lua
@@ -0,0 +1,16 @@
+local GLAdapter = require("arisu-gfx.adapter.gl")
+
+---@class gfx.gl.Instance
+local GLInstance = {}
+GLInstance.__index = GLInstance
+
+function GLInstance.new()
+	return setmetatable({}, GLInstance)
+end
+
+---@param config gfx.AdapterConfig
+function GLInstance:requestAdapter(config)
+	return GLAdapter.new(config)
+end
+
+return GLInstance
diff --git a/packages/arisu-gfx/instance/vk.lua b/packages/arisu-gfx/instance/vk.lua
diff --git a/packages/arisu-gfx/surface.lua b/packages/arisu-gfx/surface.lua
@@ -0,0 +1,5 @@
+---@class gfx.Surface
+---@field new fun(window: winit.Window): gfx.Surface
+local Surface = require("arisu-gfx.surface.gl") --[[@as gfx.Surface]]
+
+return Surface
diff --git a/packages/arisu-gfx/surface/gl.lua b/packages/arisu-gfx/surface/gl.lua
@@ -0,0 +1,23 @@
+local util = require("arisu-util")
+
+---@class gfx.gl.Surface
+---@field context gfx.Context
+local GLSurface = {}
+GLSurface.__index = GLSurface
+
+---@class gfx.Context
+---@field new fun(window: winit.Window, sharedCtx: gfx.Context?): gfx.Context
+---@field makeCurrent fun(self: gfx.Context): boolean
+---@field swapBuffers fun(self: gfx.Context)
+---@field destroy fun(self: gfx.Context)
+local Context = util.isWindows()
+	and require("arisu-gfx.surface.gl.win32")
+	or require("arisu-gfx.surface.gl.x11") --[[@as gfx.Context]]
+
+---@param window winit.win32.Window
+function GLSurface.new(window)
+	local context = Context.new(window, nil)
+	return setmetatable({ context = context, window = window }, GLSurface)
+end
+
+return GLSurface
diff --git a/packages/arisu-gfx/surface/gl/win32.lua b/packages/arisu-gfx/surface/gl/win32.lua
@@ -9,7 +9,7 @@ local gdi = require("arisu-win32.gdi")
 local Win32Context = {}
 Win32Context.__index = Win32Context
 
----@param window Win32Window
+---@param window winit.win32.Window
 ---@param sharedCtx Win32Context?
 function Win32Context.new(window, sharedCtx)
 	local hdc = user32.getDC(window.hwnd)
diff --git a/packages/arisu-gfx/surface/gl/x11.lua b/packages/arisu-gfx/surface/gl/x11.lua
@@ -9,7 +9,7 @@ local gl = require("arisu-opengl")
 local X11Context = {}
 X11Context.__index = X11Context
 
----@param window X11Window
+---@param window winit.x11.Window
 ---@param sharedCtx X11Context?
 function X11Context.new(window, sharedCtx)
 	local display = window.display
diff --git a/packages/arisu-gfx/surface/vk.lua b/packages/arisu-gfx/surface/vk.lua
diff --git a/packages/arisu-winit/raw/win32.lua b/packages/arisu-winit/raw/win32.lua
@@ -2,7 +2,7 @@ local user32 = require("arisu-win32.user32")
 local kernel32 = require("arisu-win32.kernel32")
 local util = require("arisu-util")
 
----@class Win32Window: winit.Window
+---@class winit.win32.Window: winit.Window
 ---@field display user32.HDC
 ---@field id ffi.cdata*
 ---@field hwnd user32.HWND
@@ -81,7 +81,7 @@ function Win32Window:destroy()
 end
 
 ---@class Win32EventLoop: winit.EventLoop
----@field windows table<string, Win32Window>
+---@field windows table<string, winit.win32.Window>
 ---@field class user32.WNDCLASSEXA
 ---@field isActive boolean
 ---@field currentMode "poll" | "wait"
@@ -186,12 +186,12 @@ function Win32EventLoop.new()
 	return self
 end
 
----@param window Win32Window
+---@param window winit.win32.Window
 function Win32EventLoop:register(window)
 	self.windows[window.id] = window
 end
 
----@param window Win32Window
+---@param window winit.win32.Window
 function Win32EventLoop:close(window)
 	window:destroy()
 	self.windows[window.id] = nil
diff --git a/packages/arisu-winit/raw/x11.lua b/packages/arisu-winit/raw/x11.lua
@@ -1,7 +1,7 @@
 local x11 = require("arisu-x11.x11")
 local ffi = require("ffi")
 
----@class X11Window: winit.Window
+---@class winit.x11.Window: winit.Window
 ---@field display XDisplay
 ---@field currentCursor number?
 local X11Window = {}
diff --git a/packages/arisu-x11/x11.lua b/packages/arisu-x11/x11.lua
@@ -191,7 +191,7 @@ return {
 	internAtom = C.XInternAtom,
 
 	---@param display XDisplay
-	---@param window X11Window
+	---@param window winit.x11.Window
 	---@param protocols string[]
 	setWMProtocols = function(display, window, protocols)
 		assert(display == window.display, "Display mismatch in setWMProtocols")
diff --git a/packages/arisu/init.lua b/packages/arisu/init.lua
@@ -756,7 +756,7 @@ function App:event(event, handler)
 		local time = os.clock() - self.startTime
 		self.plugins.overlay:draw(event.window, "marching_ants", time)
 
-		ctx.renderCtx:swapBuffers()
+		ctx.surface.context:swapBuffers()
 
 		if self.overlaySelection or self.overlayLine or self.overlayRectangle or self.overlayCircle then
 			handler:requestRedraw(event.window)
diff --git a/packages/arisu/plugin/overlay.lua b/packages/arisu/plugin/overlay.lua
@@ -33,7 +33,7 @@ function OverlayPlugin:register(window)
 	local renderCtx = self.renderPlugin:getContext(window)
 	assert(renderCtx, "Render context not found for overlay plugin")
 
-	renderCtx.renderCtx:makeCurrent()
+	renderCtx.surface.context:makeCurrent()
 
 	local textureManager = self.renderPlugin.sharedResources.textureManager
 	local overlayTexture = textureManager:allocate(800, 600)
@@ -238,7 +238,7 @@ function OverlayPlugin:draw(window, pattern, time)
 		patternType = PATTERN_MARCHING_ANTS
 	end
 
-	renderCtx.renderCtx:makeCurrent()
+	renderCtx.surface.context:makeCurrent()
 
 	gl.bindFramebuffer(gl.FRAMEBUFFER, ctx.framebuffer)
 	gl.viewport(0, 0, 800, 600)
