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

ui: Bug fix: Avoid dead lock

Browse Source
This commit is contained in:
Hajime Hoshi 2016-07-24 04:32:12 +09:00
parent b5f51dbccc
commit efe64d56f4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
internal/ui/ui_glfw.go
View File

@ -131,7 +131,7 @@ func (u *userInterface) ScreenScale() float64 {
} }
func (u *userInterface) Start(width, height int, scale float64, title string) error { func (u *userInterface) Start(width, height int, scale float64, title string) error {
// GLContext must be created before setting the screen size, which requres // GLContext must be created before setting the screen size, which requires
// swapping buffers. // swapping buffers.
var err error var err error
glContext, err = opengl.NewContext(currentUI.runOnMainThread) glContext, err = opengl.NewContext(currentUI.runOnMainThread)
@ -232,6 +232,10 @@ func (u *userInterface) Terminate() error {
} }
func (u *userInterface) SwapBuffers() error { func (u *userInterface) SwapBuffers() error {
// The bound framebuffer must be the default one (0) before swapping buffers.
if err := glContext.BindScreenFramebuffer(); err != nil {
return err
}
if err := u.runOnMainThread(func() error { if err := u.runOnMainThread(func() error {
return u.swapBuffers() return u.swapBuffers()
}); err != nil { }); err != nil {
@ -241,10 +245,6 @@ func (u *userInterface) SwapBuffers() error {
} }
func (u *userInterface) swapBuffers() error { func (u *userInterface) swapBuffers() error {
// The bound framebuffer must be the default one (0) before swapping buffers.
if err := glContext.BindScreenFramebuffer(); err != nil {
return err
}
u.window.SwapBuffers() u.window.SwapBuffers()
return nil return nil
} }