More gfx stuff

Author: codebycruz

packages/arisu-gfx/buffer/gl.lua

@@ -6,7 +6,8 @@ local ffi = require("ffi")
 local GLBuffer = {}
 GLBuffer.__index = GLBuffer
 
-function GLBuffer.new()
+---@param descriptor gfx.BufferDescriptor
+function GLBuffer.new(descriptor)
 	local handle = ffi.new("GLuint[1]")
 	gl.createBuffers(1, handle)
 	return setmetatable({ id = handle[0] }, GLBuffer)

packages/arisu-gfx/buffer/vk.lua

@@ -0,0 +1 @@
+local vk = require("arisu-vulkan")

packages/arisu-gfx/buffer_descriptor.lua

@@ -0,0 +1,29 @@
+---@alias gfx.BufferUsage
+--- | "COPY_DST"
+--- | "COPY_SRC"
+--- | "VERTEX"
+--- | "INDEX"
+
+---@class gfx.BufferDescriptor
+---@field size number
+---@field usages gfx.BufferUsage[]
+local BufferDescriptor = {}
+BufferDescriptor.__index = BufferDescriptor
+
+function BufferDescriptor.new()
+	return setmetatable({}, BufferDescriptor)
+end
+
+---@param size number
+function BufferDescriptor:withSize(size)
+	self.size = size
+	return self
+end
+
+---@param usages gfx.BufferUsage[]
+function BufferDescriptor:withUsages(usages)
+	self.usages = usages
+	return self
+end
+
+return BufferDescriptor

packages/arisu-gfx/context/win32.lua

@@ -3,7 +3,7 @@ local kernel32 = require("arisu-win32..kernel32")
 local wgl = require("arisu-win32.wgl")
 local gdi = require("arisu-win32.gdi")
 
----@class Win32Context: Context
+---@class Win32Context
 ---@field display user32.HDC
 ---@field ctx wgl.HGLRC
 local Win32Context = {}

packages/arisu-gfx/init.lua

@@ -1,7 +1,5 @@
 local util = require("arisu-util")
 
----@alias PresentMode "immediate" | "vsync"
-
 ---@class gfx.Context
 ---@field new fun(window: winit.Window, sharedCtx: gfx.Context?): gfx.Context
 ---@field makeCurrent fun(self: gfx.Context): boolean

packages/arisu-gfx/vertex_layout.lua

@@ -3,28 +3,28 @@ local ffi = require("ffi")
 ---@alias AttributeType "f32" | "i32"
 ---@alias Attribute { type: "f32" | "i32", size: number, offset: number, normalized: boolean }
 
----@class gfx.VertexLayoutDescriptor
+---@class gfx.VertexLayout
 ---@field attributes Attribute[]
 ---@field stride number?
-local VertexLayoutDescriptor = {}
-VertexLayoutDescriptor.__index = VertexLayoutDescriptor
+local VertexLayout = {}
+VertexLayout.__index = VertexLayout
 
-function VertexLayoutDescriptor.new()
-	return setmetatable({ attributes = {}, stride = 0 }, VertexLayoutDescriptor)
+function VertexLayout.new()
+	return setmetatable({ attributes = {}, stride = 0 }, VertexLayout)
 end
 
 ---@param attribute Attribute
-function VertexLayoutDescriptor:withAttribute(attribute)
+function VertexLayout:withAttribute(attribute)
 	table.insert(self.attributes, attribute)
 	return self
 end
 
-function VertexLayoutDescriptor:withStride(stride)
+function VertexLayout:withStride(stride)
 	self.stride = stride
 	return self
 end
 
-function VertexLayoutDescriptor:getStride()
+function VertexLayout:getStride()
 	if self.stride and self.stride > 0 then
 		return self.stride
 	end
@@ -47,4 +47,4 @@ function VertexLayoutDescriptor:getStride()
 	return maxEnd
 end
 
-return VertexLayoutDescriptor
+return VertexLayout

packages/arisu/gl/vao.lua

@@ -21,7 +21,7 @@ function VAO:unbind()
 end
 
 ---@param buffer gfx.gl.Buffer
----@param descriptor gfx.VertexLayoutDescriptor
+---@param descriptor gfx.VertexLayout
 ---@param bindingIndex number?
 function VAO:setVertexBuffer(buffer, descriptor, bindingIndex)
 	bindingIndex = bindingIndex or 0

packages/arisu/init.lua

@@ -974,27 +974,4 @@ function App:update(message, window)
 	end
 end
 
-local vk = require("arisu-vulkan")
-local ffi = require("ffi")
-
-local gpuDevice ---@type vk.PhysicalDevice?
-for _, physicalDevice in ipairs(vk.enumeratePhysicalDevices()) do
-	local properties = vk.getPhysicalDeviceProperties(physicalDevice)
-	if properties.deviceType == vk.PhysicalDeviceType.DISCRETE_GPU then
-		gpuDevice = physicalDevice
-		break
-	end
-end
-
-if gpuDevice then
-	print("Using discrete GPU for compute")
-	local device = vk.createDevice(gpuDevice)
-	local buffer = vk.createBuffer(device, { size = 200, usage = vk.BufferUsage.STORAGE_BUFFER })
-
-	local shader = vk.createShaderModule(device, {
-		codeSize = 2123,
-		pCode = ffi.cast("const unsigned int*", "foo")
-	})
-end
-
 Arisu.run(App)