mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 11:18:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/glfwwin: bug fix: WGL extension functions didn't work

Browse Source 
Closes #2101
This commit is contained in:
Hajime Hoshi 2022-05-22 00:40:47 +09:00
parent 8d3de6207b
commit 7eeef3ae0f
2 changed files with 36 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
internal/glfwwin/api_windows.go
View File

@ -18,6 +18,7 @@ import (
"errors" "errors"
"fmt" "fmt"
"runtime" "runtime"
"syscall"
"unsafe" "unsafe"
"golang.org/x/sys/windows" "golang.org/x/sys/windows"
@ -747,17 +748,19 @@ var (
procRtlVerifyVersionInfo = ntdll.NewProc("RtlVerifyVersionInfo") procRtlVerifyVersionInfo = ntdll.NewProc("RtlVerifyVersionInfo")
procWGLCreateContext = opengl32.NewProc("wglCreateContext") procWGLCreateContext = opengl32.NewProc("wglCreateContext")
procWGLCreateContextAttribsARB = opengl32.NewProc("wglCreateContextAttribsARB")
procWGLDeleteContext = opengl32.NewProc("wglDeleteContext") procWGLDeleteContext = opengl32.NewProc("wglDeleteContext")
procWGLGetCurrentContext = opengl32.NewProc("wglGetCurrentContext") procWGLGetCurrentContext = opengl32.NewProc("wglGetCurrentContext")
procWGLGetCurrentDC = opengl32.NewProc("wglGetCurrentDC") procWGLGetCurrentDC = opengl32.NewProc("wglGetCurrentDC")
procWGLGetExtensionsStringARB = opengl32.NewProc("wglGetExtensionsStringARB")
procWGLGetExtensionsStringEXT = opengl32.NewProc("wglGetExtensionsStringEXT")
procWGLGetPixelFormatAttribivARB = opengl32.NewProc("wglGetPixelFormatAttribivARB")
procWGLGetProcAddress = opengl32.NewProc("wglGetProcAddress") procWGLGetProcAddress = opengl32.NewProc("wglGetProcAddress")
procWGLMakeCurrent = opengl32.NewProc("wglMakeCurrent") procWGLMakeCurrent = opengl32.NewProc("wglMakeCurrent")
procWGLShareLists = opengl32.NewProc("wglShareLists") procWGLShareLists = opengl32.NewProc("wglShareLists")
procWGLSwapIntervalEXT = opengl32.NewProc("wglSwapIntervalEXT")
// Extension functions should be obtained from wglGetProcAddress instead of opengl32.dll (#2101).
procWGLCreateContextAttribsARB uintptr
procWGLGetExtensionsStringARB uintptr
procWGLGetExtensionsStringEXT uintptr
procWGLGetPixelFormatAttribivARB uintptr
procWGLSwapIntervalEXT uintptr
procGetDpiForMonitor = shcore.NewProc("GetDpiForMonitor") procGetDpiForMonitor = shcore.NewProc("GetDpiForMonitor")
procSetProcessDpiAwareness = shcore.NewProc("SetProcessDpiAwareness") procSetProcessDpiAwareness = shcore.NewProc("SetProcessDpiAwareness")
@ -848,6 +851,14 @@ var (
procWindowFromPoint = user32.NewProc("WindowFromPoint") procWindowFromPoint = user32.NewProc("WindowFromPoint")
) )
func initWGLExtensionFunctions() {
procWGLCreateContextAttribsARB = wglGetProcAddress("wglCreateContextAttribsARB")
procWGLGetExtensionsStringARB = wglGetProcAddress("wglGetExtensionsStringARB")
procWGLGetExtensionsStringEXT = wglGetProcAddress("wglGetExtensionsStringEXT")
procWGLGetPixelFormatAttribivARB = wglGetProcAddress("wglGetPixelFormatAttribivARB")
procWGLSwapIntervalEXT = wglGetProcAddress("wglSwapIntervalEXT")
}
func _AdjustWindowRectEx(lpRect *_RECT, dwStyle uint32, menu bool, dwExStyle uint32) error { func _AdjustWindowRectEx(lpRect *_RECT, dwStyle uint32, menu bool, dwExStyle uint32) error {
var bMenu uintptr var bMenu uintptr
if menu { if menu {
@ -1859,7 +1870,7 @@ func wglCreateContext(unnamedParam1 _HDC) (_HGLRC, error) {
} }
func wglCreateContextAttribsARB(hDC _HDC, hshareContext _HGLRC, attribList *int32) (_HGLRC, error) { func wglCreateContextAttribsARB(hDC _HDC, hshareContext _HGLRC, attribList *int32) (_HGLRC, error) {
r, _, e := procWGLCreateContextAttribsARB.Call(uintptr(hDC), uintptr(hshareContext), uintptr(unsafe.Pointer(attribList))) r, _, e := syscall.Syscall(procWGLCreateContextAttribsARB, 3, uintptr(hDC), uintptr(hshareContext), uintptr(unsafe.Pointer(attribList)))
if _HGLRC(r) == 0 { if _HGLRC(r) == 0 {
// TODO: Show more detailed error? See the original implementation. // TODO: Show more detailed error? See the original implementation.
return 0, fmt.Errorf("glfwwin: wglCreateContextAttribsARB failed: %w", e) return 0, fmt.Errorf("glfwwin: wglCreateContextAttribsARB failed: %w", e)
@ -1886,25 +1897,25 @@ func wglGetCurrentDC() _HDC {
} }
func wglGetExtensionsStringARB(hdc _HDC) string { func wglGetExtensionsStringARB(hdc _HDC) string {
r, _, _ := procWGLGetExtensionsStringARB.Call(uintptr(hdc)) r, _, _ := syscall.Syscall(procWGLGetExtensionsStringARB, 1, uintptr(hdc), 0, 0)
return windows.BytePtrToString((*byte)(unsafe.Pointer(r))) return windows.BytePtrToString((*byte)(unsafe.Pointer(r)))
} }
func wglGetExtensionsStringARB_Available() bool { func wglGetExtensionsStringARB_Available() bool {
return procWGLGetExtensionsStringARB.Find() == nil return procWGLGetExtensionsStringARB != 0
} }
func wglGetExtensionsStringEXT() string { func wglGetExtensionsStringEXT() string {
r, _, _ := procWGLGetExtensionsStringEXT.Call() r, _, _ := syscall.Syscall(procWGLGetExtensionsStringEXT, 0, 0, 0, 0)
return windows.BytePtrToString((*byte)(unsafe.Pointer(r))) return windows.BytePtrToString((*byte)(unsafe.Pointer(r)))
} }
func wglGetExtensionsStringEXT_Available() bool { func wglGetExtensionsStringEXT_Available() bool {
return procWGLGetExtensionsStringEXT.Find() == nil return procWGLGetExtensionsStringEXT != 0
} }
func wglGetPixelFormatAttribivARB(hdc _HDC, iPixelFormat int32, iLayerPlane int32, nAttributes uint32, piAttributes *int32, piValues *int32) error { func wglGetPixelFormatAttribivARB(hdc _HDC, iPixelFormat int32, iLayerPlane int32, nAttributes uint32, piAttributes *int32, piValues *int32) error {
r, _, e := procWGLGetPixelFormatAttribivARB.Call(uintptr(hdc), uintptr(iPixelFormat), uintptr(iLayerPlane), uintptr(nAttributes), uintptr(unsafe.Pointer(piAttributes)), uintptr(unsafe.Pointer(piValues))) r, _, e := syscall.Syscall6(procWGLGetPixelFormatAttribivARB, 6, uintptr(hdc), uintptr(iPixelFormat), uintptr(iLayerPlane), uintptr(nAttributes), uintptr(unsafe.Pointer(piAttributes)), uintptr(unsafe.Pointer(piValues)))
if int32(r) == 0 { if int32(r) == 0 {
return fmt.Errorf("glfwwin: wglGetPixelFormatAttribivARB failed: %w", e) return fmt.Errorf("glfwwin: wglGetPixelFormatAttribivARB failed: %w", e)
} }
@ -1937,7 +1948,7 @@ func wglShareLists(unnamedParam1 _HGLRC, unnamedParam2 _HGLRC) error {
} }
func wglSwapIntervalEXT(interval int32) error { func wglSwapIntervalEXT(interval int32) error {
r, _, e := procWGLSwapIntervalEXT.Call(uintptr(interval)) r, _, e := syscall.Syscall(procWGLSwapIntervalEXT, 1, uintptr(interval), 0, 0)
if int32(r) == 0 { if int32(r) == 0 {
return fmt.Errorf("glfwwin: wglSwapIntervalEXT failed: %w", e) return fmt.Errorf("glfwwin: wglSwapIntervalEXT failed: %w", e)
} }

6
internal/glfwwin/wglcontext_windows.go
View File

@ -396,6 +396,12 @@ func initWGL() error {
return err return err
} }
// NOTE: Functions must be loaded first as they're needed to retrieve the
// extension string that tells us whether the functions are supported
//
// Interestingly, wglGetProcAddress might return 0 after extensionSupportedWGL is called.
initWGLExtensionFunctions()
// NOTE: WGL_ARB_extensions_string and WGL_EXT_extensions_string are not // NOTE: WGL_ARB_extensions_string and WGL_EXT_extensions_string are not
// checked below as we are already using them // checked below as we are already using them
_glfw.wgl.ARB_multisample = extensionSupportedWGL("WGL_ARB_multisample") _glfw.wgl.ARB_multisample = extensionSupportedWGL("WGL_ARB_multisample")