mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-12 12:08:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

ui: Initialize GLFW before Run

Browse Source
This commit is contained in:
Hajime Hoshi 2018-05-04 23:55:23 +09:00
parent 6d1342a934
commit d41f959b96
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
internal/ui/ui_glfw.go
View File

@ -66,11 +66,13 @@ var (
initCursorVisible: true, initCursorVisible: true,
initWindowDecorated: true, initWindowDecorated: true,
} }
currentUIInitialized = make(chan struct{})
) )
func init() { func init() {
runtime.LockOSThread() runtime.LockOSThread()
if err := initialize(); err != nil {
panic(err)
}
} }
func initialize() error { func initialize() error {
@ -116,11 +118,6 @@ func initialize() error {
func RunMainThreadLoop(ch <-chan error) error { func RunMainThreadLoop(ch <-chan error) error {
// This must be called on the main thread. // This must be called on the main thread.
if err := initialize(); err != nil {
return err
}
close(currentUIInitialized)
// TODO: Check this is done on the main thread. // TODO: Check this is done on the main thread.
currentUI.setRunning(true) currentUI.setRunning(true)
defer func() { defer func() {
@ -445,8 +442,6 @@ func SetWindowDecorated(decorated bool) {
} }
func Run(width, height int, scale float64, title string, g GraphicsContext, mainloop bool) error { func Run(width, height int, scale float64, title string, g GraphicsContext, mainloop bool) error {
<-currentUIInitialized
u := currentUI u := currentUI
// GLContext must be created before setting the screen size, which requires // GLContext must be created before setting the screen size, which requires
// swapping buffers. // swapping buffers.