From b5d065151ab8bc54c45c80205d79e9136d5bc1ee Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Sun, 18 Mar 2018 23:54:45 +0900
Subject: [PATCH] restorable: Don't flatten vertices until actually needed

---
 internal/restorable/image.go | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/internal/restorable/image.go b/internal/restorable/image.go
index f11627fa0..5ca0d9d6a 100644
--- a/internal/restorable/image.go
+++ b/internal/restorable/image.go
@@ -28,7 +28,7 @@ import (
 // drawImageHistoryItem is an item for history of draw-image commands.
 type drawImageHistoryItem struct {
 	image    *Image
-	vertices []float32
+	vertices [][]float32
 	colorm   *affine.ColorM
 	mode     opengl.CompositeMode
 	filter   graphics.Filter
@@ -165,7 +165,7 @@ func (i *Image) appendDrawImageHistory(image *Image, vertices []float32, colorm
 	if len(i.drawImageHistory) > 0 {
 		last := i.drawImageHistory[len(i.drawImageHistory)-1]
 		if last.canMerge(image, colorm, mode, filter) {
-			last.vertices = append(last.vertices, vertices...)
+			last.vertices = append(last.vertices, vertices)
 			return
 		}
 	}
@@ -178,7 +178,7 @@ func (i *Image) appendDrawImageHistory(image *Image, vertices []float32, colorm
 	// So we don't have to care if image is stale or not here.
 	item := &drawImageHistoryItem{
 		image:    image,
-		vertices: vertices,
+		vertices: [][]float32{vertices},
 		colorm:   colorm,
 		mode:     mode,
 		filter:   filter,
@@ -306,7 +306,11 @@ func (i *Image) restore() error {
 		if c.image.hasDependency() {
 			panic("not reached")
 		}
-		gimg.DrawImage(c.image.image, c.vertices, c.colorm, c.mode, c.filter)
+		vs := []float32{}
+		for _, v := range c.vertices {
+			vs = append(vs, v...)
+		}
+		gimg.DrawImage(c.image.image, vs, c.colorm, c.mode, c.filter)
 	}
 	i.image = gimg