internal/graphicsdriver/metal, internal/graphicsdriver/opengl: change…

… the return type to pointers On second thought, returning pointers is more natural. Handling nil is a caller's responsibility.
xiaoshengduan · Mar 24, 2022 · eeb5687 · eeb5687
1 parent 7bb7e45
commit eeb5687
Show file tree

Hide file tree

Showing 9 changed files with 43 additions and 19 deletions.
diff --git a/internal/graphicsdriver/metal/graphics_darwin.go b/internal/graphicsdriver/metal/graphics_darwin.go
@@ -367,7 +367,7 @@ func init() {
 
 var theGraphics Graphics
 
-func Get() graphicsdriver.Graphics {
+func Get() *Graphics {
 	if !isMetalAvailable {
 		return nil
 	}

diff --git a/internal/graphicsdriver/opengl/graphics.go b/internal/graphicsdriver/opengl/graphics.go
@@ -24,7 +24,7 @@ import (
 
 var theGraphics Graphics
 
-func Get() graphicsdriver.Graphics {
+func Get() *Graphics {
 	return &theGraphics
 }
 

diff --git a/internal/ui/ui_android.go b/internal/ui/ui_android.go
@@ -24,11 +24,14 @@ type graphicsDriverGetterImpl struct {
 }
 
 func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
-	return opengl.Get()
+	return g.getOpenGL()
 }
 
 func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
-	return opengl.Get()
+	if g := opengl.Get(); g != nil {
+		return g
+	}
+	return nil
 }
 
 func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

diff --git a/internal/ui/ui_cbackend.go b/internal/ui/ui_cbackend.go
@@ -27,12 +27,15 @@ import (
 
 type graphicsDriverGetterImpl struct{}
 
-func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
-	return opengl.Get()
+func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
+	return g.getOpenGL()
 }
 
 func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
-	return opengl.Get()
+	if g := opengl.Get(); g != nil {
+		return g
+	}
+	return nil
 }
 
 func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

diff --git a/internal/ui/ui_glfw_darwin.go b/internal/ui/ui_glfw_darwin.go
@@ -242,11 +242,17 @@ func (g *graphicsDriverGetterImpl) getAuto() 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 {
-	return metal.Get()
+	if m := metal.Get(); m != nil {
+		return m
+	}
+	return nil
 }
 
 // clearVideoModeScaleCache must be called from the main thread.

diff --git a/internal/ui/ui_glfw_unix.go b/internal/ui/ui_glfw_unix.go
@@ -33,12 +33,15 @@ import (
 
 type graphicsDriverGetterImpl struct{}
 
-func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
-	return opengl.Get()
+func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
+	return g.getOpenGL()
 }
 
 func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
-	return opengl.Get()
+	if g := opengl.Get(); g != nil {
+		return g
+	}
+	return nil
 }
 
 func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

diff --git a/internal/ui/ui_glfw_windows.go b/internal/ui/ui_glfw_windows.go
@@ -31,12 +31,15 @@ import (
 
 type graphicsDriverGetterImpl struct{}
 
-func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
-	return opengl.Get()
+func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
+	return g.getOpenGL()
 }
 
 func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
-	return opengl.Get()
+	if g := opengl.Get(); g != nil {
+		return g
+	}
+	return nil
 }
 
 func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {

diff --git a/internal/ui/ui_ios.go b/internal/ui/ui_ios.go
@@ -35,7 +35,10 @@ func (g *graphicsDriverGetterImpl) getAuto() 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 {

diff --git a/internal/ui/ui_js.go b/internal/ui/ui_js.go
@@ -27,12 +27,15 @@ import (
 
 type graphicsDriverGetterImpl struct{}
 
-func (*graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
-	return opengl.Get()
+func (g *graphicsDriverGetterImpl) getAuto() graphicsdriver.Graphics {
+	return g.getOpenGL()
 }
 
 func (*graphicsDriverGetterImpl) getOpenGL() graphicsdriver.Graphics {
-	return opengl.Get()
+	if g := opengl.Get(); g != nil {
+		return g
+	}
+	return nil
 }
 
 func (*graphicsDriverGetterImpl) getMetal() graphicsdriver.Graphics {