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

uidriver/glfw: Bug fix: Thread must be set before the loop starts

Browse Source 
The graphics driver needs to have its thread before the loop
starts, or the driver crashes (nil reference) when it tries to use
the thread.
This commit is contained in:
Hajime Hoshi 2019-06-24 02:03:12 +09:00
parent 0cc49b6923
commit de4b439228
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
internal/uidriver/glfw/ui.go
View File

@ -556,6 +556,8 @@ func init() {
func (u *UserInterface) Run(width, height int, scale float64, title string, uicontext driver.UIContext, graphics driver.Graphics) error { func (u *UserInterface) Run(width, height int, scale float64, title string, uicontext driver.UIContext, graphics driver.Graphics) error {
// Initialize the main thread first so the thread is available at u.run (#809). // Initialize the main thread first so the thread is available at u.run (#809).
u.t = thread.New() u.t = thread.New()
u.graphics = graphics
u.graphics.SetThread(u.t)
ctx, cancel := context.WithCancel(context.Background()) ctx, cancel := context.WithCancel(context.Background())
@ -563,7 +565,7 @@ func (u *UserInterface) Run(width, height int, scale float64, title string, uico
go func() { go func() {
defer cancel() defer cancel()
defer close(ch) defer close(ch)
if err := u.run(width, height, scale, title, uicontext, graphics); err != nil { if err := u.run(width, height, scale, title, uicontext); err != nil {
ch <- err ch <- err
} }
}() }()
@ -578,12 +580,9 @@ func (u *UserInterface) RunWithoutMainLoop(width, height int, scale float64, tit
panic("glfw: RunWithoutMainLoop is not implemented") panic("glfw: RunWithoutMainLoop is not implemented")
} }
func (u *UserInterface) run(width, height int, scale float64, title string, context driver.UIContext, graphics driver.Graphics) error { func (u *UserInterface) run(width, height int, scale float64, title string, context driver.UIContext) error {
_ = u.t.Call(func() error { _ = u.t.Call(func() error {
u.graphics = graphics if u.graphics.IsGL() {
u.graphics.SetThread(u.t)
if graphics.IsGL() {
glfw.WindowHint(glfw.ContextVersionMajor, 2) glfw.WindowHint(glfw.ContextVersionMajor, 2)
glfw.WindowHint(glfw.ContextVersionMinor, 1) glfw.WindowHint(glfw.ContextVersionMinor, 1)
} else { } else {
@ -610,7 +609,7 @@ func (u *UserInterface) run(width, height int, scale float64, title string, cont
} }
u.window = window u.window = window
if graphics.IsGL() { if u.graphics.IsGL() {
u.window.MakeContextCurrent() u.window.MakeContextCurrent()
} }
@ -685,7 +684,7 @@ func (u *UserInterface) run(width, height int, scale float64, title string, cont
w = u.nativeWindow() w = u.nativeWindow()
return nil return nil
}) })
graphics.SetWindow(w) u.graphics.SetWindow(w)
return u.loop(context) return u.loop(context)
} }