internal/graphicsdriver/opengl: refactoring

internal/graphicsdriver/opengl/graphics.go

@@ -19,26 +19,9 @@ import (
 
 	"github.com/hajimehoshi/ebiten/v2/internal/graphics"
 	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
-	"github.com/hajimehoshi/ebiten/v2/internal/microsoftgdk"
 	"github.com/hajimehoshi/ebiten/v2/internal/shaderir"
 )
 
-// NewGraphics creates an implementation of graphicsdriver.Graphics for OpenGL.
-// The returned graphics value is nil iff the error is not nil.
-//
-// context is an additional information to initialize the underlying context.
-// context type depends on environments.
-func NewGraphics(context any) (graphicsdriver.Graphics, error) {
-	if microsoftgdk.IsXbox() {
-		return nil, fmt.Errorf("opengl: OpenGL is not supported on Xbox")
-	}
-	g := &Graphics{}
-	if err := g.init(context); err != nil {
-		return nil, err
-	}
-	return g, nil
-}
-
 type activatedTexture struct {
 	textureNative textureNative
 	index         int

internal/graphicsdriver/opengl/graphics_gl.go

@@ -17,9 +17,22 @@
 package opengl
 
 import (
+	"fmt"
+
+	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver"
 	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl"
+	"github.com/hajimehoshi/ebiten/v2/internal/microsoftgdk"
 )
 
-func (g *Graphics) init(context any) error {
+// NewGraphics creates an implementation of graphicsdriver.Graphics for OpenGL.
-	return gl.Init()
+// The returned graphics value is nil iff the error is not nil.
+func NewGraphics() (graphicsdriver.Graphics, error) {
+	if microsoftgdk.IsXbox() {
+		return nil, fmt.Errorf("opengl: OpenGL is not supported on Xbox")
+	}
+	g := &Graphics{}
+	if err := gl.Init(); err != nil {
+		return nil, err
+	}
+	return g, nil
 }

internal/graphicsdriver/opengl/graphics_gles.go

@@ -20,7 +20,10 @@ import (
 	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl"
 )
 
-func (g *Graphics) init(context any) error {
+// NewGraphics creates an implementation of graphicsdriver.Graphics for OpenGL.
+// The returned graphics value is nil iff the error is not nil.
+func NewGraphics() (graphicsdriver.Graphics, error) {
+	g := &Graphics{}
 	g.context.ctx = gl.DefaultContext{}
-	return nil
+	return g, nil
 }

internal/graphicsdriver/opengl/graphics_js.go

@@ -18,7 +18,10 @@ import (
 	"syscall/js"
 )
 
-func (g *Graphics) init(canvas any) error {
+// NewGraphics creates an implementation of graphicsdriver.Graphics for OpenGL.
-	g.context.canvas = canvas.(js.Value)
+// The returned graphics value is nil iff the error is not nil.
-	return nil
+func NewGraphics(canvas js.Value) (graphicsdriver.Graphics, error) {
+	g := &Graphics{}
+	g.context.canvas = canvas
+	return g, nil
 }

internal/graphicsdriver/opengl/graphics_mobile.go

@@ -22,11 +22,14 @@ import (
 	"github.com/hajimehoshi/ebiten/v2/internal/graphicsdriver/opengl/gl"
 )
 
-func (g *Graphics) init(context any) error {
+// NewGraphics creates an implementation of graphicsdriver.Graphics for OpenGL.
+// The returned graphics value is nil iff the error is not nil.
+func NewGraphics(context mgl.Context) (graphicsdriver.Graphics, error) {
+	g := &Graphics{}
 	if context != nil {
 		g.context.ctx = gl.NewGomobileContext(context.(mgl.Context))
 	} else {
 		g.context.ctx = gl.DefaultContext{}
 	}
-	return nil
+	return g, nil
 }

internal/ui/ui_glfw_darwin.go

@@ -172,7 +172,7 @@ func (g *graphicsDriverCreatorImpl) newAuto() (graphicsdriver.Graphics, Graphics
 }
 
 func (*graphicsDriverCreatorImpl) newOpenGL() (graphicsdriver.Graphics, error) {
-	return opengl.NewGraphics(nil)
+	return opengl.NewGraphics()
 }
 
 func (*graphicsDriverCreatorImpl) newDirectX() (graphicsdriver.Graphics, error) {

internal/ui/ui_glfw_unix.go

@@ -40,7 +40,7 @@ func (g *graphicsDriverCreatorImpl) newAuto() (graphicsdriver.Graphics, Graphics
 }
 
 func (*graphicsDriverCreatorImpl) newOpenGL() (graphicsdriver.Graphics, error) {
-	return opengl.NewGraphics(nil)
+	return opengl.NewGraphics()
 }
 
 func (*graphicsDriverCreatorImpl) newDirectX() (graphicsdriver.Graphics, error) {

internal/ui/ui_glfw_windows.go

@@ -47,7 +47,7 @@ func (g *graphicsDriverCreatorImpl) newAuto() (graphicsdriver.Graphics, Graphics
 }
 
 func (*graphicsDriverCreatorImpl) newOpenGL() (graphicsdriver.Graphics, error) {
-	return opengl.NewGraphics(nil)
+	return opengl.NewGraphics()
 }
 
 func (g *graphicsDriverCreatorImpl) newDirectX() (graphicsdriver.Graphics, error) {

internal/ui/ui_nintendosdk.go

@@ -32,7 +32,7 @@ func (g *graphicsDriverCreatorImpl) newAuto() (graphicsdriver.Graphics, Graphics
 }
 
 func (*graphicsDriverCreatorImpl) newOpenGL() (graphicsdriver.Graphics, error) {
-	return opengl.NewGraphics(nil)
+	return opengl.NewGraphics()
 }
 
 func (*graphicsDriverCreatorImpl) newDirectX() (graphicsdriver.Graphics, error) {