From 6151fd313f3a58cbf864bcb19209add21228f5e5 Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sat, 13 Jan 2024 19:15:42 +0900
Subject: [PATCH] internal/restorable: integrate Image.Extend into
 internal/atlas

Updates #805
---
 internal/atlas/image.go      | 42 ++++++++++++++++++++++++++++++++----
 internal/restorable/image.go | 25 ---------------------
 2 files changed, 38 insertions(+), 29 deletions(-)

diff --git a/internal/atlas/image.go b/internal/atlas/image.go
index fddc1662b..43ab44e58 100644
--- a/internal/atlas/image.go
+++ b/internal/atlas/image.go
@@ -50,6 +50,16 @@ func min(a, b int) int {
 	return b
 }
 
+// quadVertices returns vertices to render a quad. These values are passed to graphicscommand.Image.
+func quadVertices(dx0, dy0, dx1, dy1, sx0, sy0, sx1, sy1, cr, cg, cb, ca float32) []float32 {
+	return []float32{
+		dx0, dy0, sx0, sy0, cr, cg, cb, ca,
+		dx1, dy0, sx1, sy0, cr, cg, cb, ca,
+		dx0, dy1, sx0, sy1, cr, cg, cb, ca,
+		dx1, dy1, sx1, sy1, cr, cg, cb, ca,
+	}
+}
+
 // baseCountToPutOnSourceBackend represents the base time duration when the image can be put onto an atlas.
 // Actual time duration is increased in an exponential way for each usage as a rendering target.
 const baseCountToPutOnSourceBackend = 10
@@ -108,14 +118,38 @@ func (b *backend) tryAlloc(width, height int) (*packing.Node, bool) {
 		return nil, false
 	}
 
-	w, h := b.page.Size()
-	b.restorable = b.restorable.Extend(w, h)
-	b.width = w
-	b.height = h
+	b.extendIfNeeded(b.page.Size())
 
 	return n, true
 }
 
+// extendIfNeeded extends the image by the given size if necessary.
+// extendIfNeeded creates a new image with the given size and copies the pixels of the given source image.
+// extendIfNeeded disposes an old image after its call when a new image is created.
+func (b *backend) extendIfNeeded(width, height int) {
+	if b.width >= width && b.height >= height {
+		return
+	}
+
+	// Assume that the screen image is never extended.
+	newImg := restorable.NewImage(width, height, false)
+
+	// Use DrawTriangles instead of WritePixels because the image i might be stale and not have its pixels
+	// information.
+	srcs := [graphics.ShaderImageCount]*graphicscommand.Image{b.restorable.Image}
+	sw, sh := b.restorable.Image.InternalSize()
+	vs := quadVertices(0, 0, float32(sw), float32(sh), 0, 0, float32(sw), float32(sh), 1, 1, 1, 1)
+	is := graphics.QuadIndices()
+	dr := image.Rect(0, 0, sw, sh)
+	newImg.Image.DrawTriangles(srcs, vs, is, graphicsdriver.BlendCopy, dr, [graphics.ShaderImageCount]image.Rectangle{}, NearestFilterShader.ensureShader().Shader, nil, graphicsdriver.FillAll)
+	b.restorable.Image.Dispose()
+	b.restorable.Image = nil
+
+	b.restorable = newImg
+	b.width = width
+	b.height = height
+}
+
 var (
 	// backendsM is a mutex for critical sections of the backend and packing.Node objects.
 	backendsM sync.Mutex
diff --git a/internal/restorable/image.go b/internal/restorable/image.go
index 48f06bda5..ee08a81a3 100644
--- a/internal/restorable/image.go
+++ b/internal/restorable/image.go
@@ -52,31 +52,6 @@ func NewImage(width, height int, screen bool) *Image {
 	return i
 }
 
-// Extend extends the image by the given size.
-// Extend creates a new image with the given size and copies the pixels of the given source image.
-// Extend disposes itself after its call.
-func (i *Image) Extend(width, height int) *Image {
-	if i.width >= width && i.height >= height {
-		return i
-	}
-
-	// Assume that the screen image is never extended.
-	newImg := NewImage(width, height, false)
-
-	// Use DrawTriangles instead of WritePixels because the image i might be stale and not have its pixels
-	// information.
-	srcs := [graphics.ShaderImageCount]*graphicscommand.Image{i.Image}
-	sw, sh := i.Image.InternalSize()
-	vs := quadVertices(0, 0, float32(sw), float32(sh), 0, 0, float32(sw), float32(sh), 1, 1, 1, 1)
-	is := graphics.QuadIndices()
-	dr := image.Rect(0, 0, sw, sh)
-	newImg.Image.DrawTriangles(srcs, vs, is, graphicsdriver.BlendCopy, dr, [graphics.ShaderImageCount]image.Rectangle{}, NearestFilterShader.Shader, nil, graphicsdriver.FillAll)
-	i.Image.Dispose()
-	i.Image = nil
-
-	return newImg
-}
-
 // quadVertices returns vertices to render a quad. These values are passed to graphicscommand.Image.
 func quadVertices(dx0, dy0, dx1, dy1, sx0, sy0, sx1, sy1, cr, cg, cb, ca float32) []float32 {
 	return []float32{