graphics: Refactoring

image.go

@@ -20,7 +20,6 @@ import (
 	"runtime"
 	"sync"
 
-	"github.com/hajimehoshi/ebiten/internal/graphics"
 	"github.com/hajimehoshi/ebiten/internal/graphics/opengl"
 )
 
@@ -195,11 +194,7 @@ type DrawImageOptions struct {
 //
 // This function is concurrent-safe.
 func NewImage(width, height int, filter Filter) (*Image, error) {
-	i, err := graphics.NewImage(width, height, glFilter(filter))
+	img, err := newImageImpl(width, height, filter)
-	if err != nil {
-		return nil, err
-	}
-	img, err := newImageImpl(i, filter)
 	if err != nil {
 		return nil, err
 	}

imageimpl.go

@@ -41,12 +41,15 @@ type imageImpl struct {
 	m        sync.Mutex
 }
 
-func newImageImpl(image *graphics.Image, filter Filter) (*imageImpl, error) {
+func newImageImpl(width, height int, filter Filter) (*imageImpl, error) {
-	w, h := image.Size()
+	img, err := graphics.NewImage(width, height, glFilter(filter))
+	if err != nil {
+		return nil, err
+	}
 	i := &imageImpl{
-		image:  image,
+		image:  img,
-		width:  w,
+		width:  width,
-		height: h,
+		height: height,
 		filter: filter,
 	}
 	runtime.SetFinalizer(i, (*imageImpl).Dispose)
@@ -86,16 +89,18 @@ func newImageImplFromImage(source image.Image, filter Filter) (*imageImpl, error
 }
 
 func newScreenImageImpl(width, height int) (*imageImpl, error) {
-	i, err := graphics.NewScreenFramebufferImage(width, height)
+	img, err := graphics.NewScreenFramebufferImage(width, height)
 	if err != nil {
 		return nil, err
 	}
-	img, err := newImageImpl(i, FilterNearest)
+	i := &imageImpl{
-	if err != nil {
+		image:  img,
-		return nil, err
+		width:  width,
+		height: height,
+		screen: true,
 	}
-	img.screen = true
+	runtime.SetFinalizer(i, (*imageImpl).Dispose)
-	return img, nil
+	return i, nil
 }
 
 func (i *imageImpl) Fill(clr color.Color) error {