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

internal/graphicsdriver/metal, internal/graphicsdriver/opengl: change the return type to pointers

Browse Source 
On second thought, returning pointers is more natural. Handling
nil is a caller's responsibility.
This commit is contained in:
Hajime Hoshi 2022-03-24 13:20:36 +09:00
parent 7bb7e45522
commit eeb5687b73
9 changed files with 43 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
internal/graphicsdriver/metal/graphics_darwin.go
View File

@ -367,7 +367,7 @@ func init() {
var theGraphics Graphics var theGraphics Graphics
func Get() graphicsdriver.Graphics { func Get() *Graphics {
if !isMetalAvailable { if !isMetalAvailable {
return nil return nil
} }

2
internal/graphicsdriver/opengl/graphics.go
View File

@ -24,7 +24,7 @@ import (
var theGraphics Graphics var theGraphics Graphics
func Get() graphicsdriver.Graphics { func Get() *Graphics {
return &theGraphics return &theGraphics
} }

7
internal/ui/ui_android.go
View File

@ -24,11 +24,14 @@ type graphicsDriverGetterImpl struct {
} }
func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics { func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
return opengl.Get() return g.getOpenGL()
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

9
internal/ui/ui_cbackend.go
View File

@ -27,12 +27,15 @@ import (
type graphicsDriverGetterImpl struct{} type graphicsDriverGetterImpl struct{}
func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics { func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
return opengl.Get() return g.getOpenGL()
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

10
internal/ui/ui_glfw_darwin.go
View File

@ -242,11 +242,17 @@ func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {
return metal.Get() if m := metal.Get(); m != nil {
return m
}
return nil
} }
// clearVideoModeScaleCache must be called from the main thread. // clearVideoModeScaleCache must be called from the main thread.

9
internal/ui/ui_glfw_unix.go
View File

@ -33,12 +33,15 @@ import (
type graphicsDriverGetterImpl struct{} type graphicsDriverGetterImpl struct{}
func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics { func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
return opengl.Get() return g.getOpenGL()
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

9
internal/ui/ui_glfw_windows.go
View File

@ -31,12 +31,15 @@ import (
type graphicsDriverGetterImpl struct{} type graphicsDriverGetterImpl struct{}
func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics { func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
return opengl.Get() return g.getOpenGL()
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

5
internal/ui/ui_ios.go
View File

@ -35,7 +35,10 @@ func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (g *graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (g *graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

9
internal/ui/ui_js.go
View File

@ -27,12 +27,15 @@ import (
type graphicsDriverGetterImpl struct{} type graphicsDriverGetterImpl struct{}
func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics { func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
return opengl.Get() return g.getOpenGL()
} }
func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
return opengl.Get() if g := opengl.Get(); g != nil {
return g
}
return nil
} }
func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics { func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {