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

graphics: Bug fix: Avoid init-order dependency by sync.Once

Browse Source 
graphicsDriver() function can be called from init() functions,
while isMetalSupported is initialized in another init() functions.
There was a hidden dependency on init functions.

This change avoid this by replacing the init function with
sync.Once.

Updates #886
This commit is contained in:
Hajime Hoshi 2019-06-24 03:04:25 +09:00
parent f7338eb715
commit c492920842
1 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
graphics_mac.go
View File

@ -29,6 +29,8 @@ package ebiten
import "C"
import (
"sync"
"github.com/hajimehoshi/ebiten/internal/driver"
"github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal"
"github.com/hajimehoshi/ebiten/internal/graphicsdriver/metal/mtl"
@ -38,23 +40,27 @@ import (
var (
// isMetalSupported represents whether Metal is supported.
isMetalSupported = true
// isMetalSupportedOnce initialized isMetalSupported.
//
// Use sync.Once instead of init function to avoid init-order dependency (#886).
isMetalSupportedOnce sync.Once
)
func init() {
// On old mac devices like iMac 2011, Metal is not supported (#779).
if _, err := mtl.CreateSystemDefaultDevice(); err != nil {
isMetalSupported = false
return
}
// On macOS 10.11 El Capitan, there is a rendering issue on Metal (#781).
// Use the OpenGL in macOS 10.11 or older.
if C.getMacOSMinorVersion() <= 11 {
isMetalSupported = false
return
}
}
func graphicsDriver() driver.Graphics {
isMetalSupportedOnce.Do(func() {
// On old mac devices like iMac 2011, Metal is not supported (#779).
if _, err := mtl.CreateSystemDefaultDevice(); err != nil {
isMetalSupported = false
return
}
// On macOS 10.11 El Capitan, there is a rendering issue on Metal (#781).
// Use the OpenGL in macOS 10.11 or older.
if C.getMacOSMinorVersion() <= 11 {
isMetalSupported = false
return
}
})
if isMetalSupported {
return metal.Get()
}