Skip to content

fix: use functional interface for GL callback #843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Wyvest merged 1 commit into from
Jul 24, 2026
Merged

fix: use functional interface for GL callback #843

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 20 additions & 16 deletions minecraft/src/main/kotlin/org/polyfrost/oneconfig/internal/ui/services/GLInterfaceFactory.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,30 +58,23 @@ internal object GLInterfaceFactory {
}
}

private class GetProcCallback(
private val provider: FunctionProvider,
) : CallbackI {

@FunctionalInterface
private fun interface GetProcCallbackI : CallbackI {
//? if >=26.1
override fun getDescriptor(): Callback.Descriptor = DESCRIPTOR
//? if <26.1
//override fun getCallInterface(): FFICIF = CALL_INTERFACE

override fun callback(ret: Long, args: Long) {
var addr = 0L
try {
val namePtr = MemoryUtil.memGetAddress(
MemoryUtil.memGetAddress(args + Pointer.POINTER_SIZE.toLong())
)
if (namePtr != 0L) {
addr = provider.getFunctionAddress(MemoryUtil.memUTF8(namePtr))
}
} catch (_: Throwable) {
addr = 0L
}
APIUtil.apiClosureRetP(ret, addr)
val contextPtr = MemoryUtil.memGetAddress(MemoryUtil.memGetAddress(args))
val namePtr = MemoryUtil.memGetAddress(
MemoryUtil.memGetAddress(args + Pointer.POINTER_SIZE.toLong())
)
APIUtil.apiClosureRetP(ret, invoke(contextPtr, namePtr))
}

fun invoke(context: Long, name: Long): Long

companion object {
private val CALL_INTERFACE: FFICIF = APIUtil.apiCreateCIF(
LibFFI.FFI_DEFAULT_ABI,
Expand All @@ -93,4 +86,15 @@ internal object GLInterfaceFactory {
private val DESCRIPTOR: Callback.Descriptor = Callback.Descriptor(MethodHandles.lookup(), CALL_INTERFACE)
}
}

private class GetProcCallback(
private val provider: FunctionProvider,
) : GetProcCallbackI {

override fun invoke(context: Long, name: Long): Long = try {
if (name != 0L) provider.getFunctionAddress(MemoryUtil.memUTF8(name)) else 0L
} catch (_: Throwable) {
0L
}
}
}
Loading