restorable: Refactoring: Make (*Image).Size() available even after disposing

This commit is contained in:
Hajime Hoshi 2019-08-16 02:28:59 +09:00
parent 6ba6cdc721
commit ccacc4a0b8
3 changed files with 21 additions and 20 deletions

View File

@ -101,11 +101,6 @@ func (i *Image) Dispose() {
theCommandQueue.Enqueue(c)
}
func (i *Image) Size() (int, int) {
// i.image can be nil before initializing.
return i.width, i.height
}
func (i *Image) InternalSize() (int, int) {
return i.internalWidth, i.internalHeight
}

View File

@ -75,6 +75,9 @@ type drawTrianglesHistoryItem struct {
type Image struct {
image *graphicscommand.Image
width int
height int
basePixels Pixels
// drawTrianglesHistory is a set of draw-image commands.
@ -100,6 +103,8 @@ func init() {
const w, h = 16, 16
emptyImage = &Image{
image: graphicscommand.NewImage(w, h),
width: w,
height: h,
priority: true,
}
pix := make([]byte, 4*w*h)
@ -120,7 +125,9 @@ func init() {
// Note that Dispose is not called automatically.
func NewImage(width, height int) *Image {
i := &Image{
image: graphicscommand.NewImage(width, height),
image: graphicscommand.NewImage(width, height),
width: width,
height: height,
}
i.clear()
theImages.add(i)
@ -172,6 +179,8 @@ func (i *Image) MakeVolatile() {
func NewScreenFramebufferImage(width, height int) *Image {
i := &Image{
image: graphicscommand.NewScreenFramebufferImage(width, height),
width: width,
height: height,
screen: true,
}
i.clear()
@ -238,7 +247,8 @@ func (i *Image) BasePixelsForTesting() *Pixels {
// Size returns the image's size.
func (i *Image) Size() (int, int) {
return i.image.Size()
// Do not acccess i.image since i.image can be nil after disposing.
return i.width, i.height
}
// internalSize returns the size of the internal texture.
@ -290,7 +300,7 @@ func (i *Image) ClearPixels(x, y, width, height int) {
//
// ReplacePixels for a part is forbidden if the image is rendered with DrawTriangles or Fill.
func (i *Image) ReplacePixels(pixels []byte, x, y, width, height int) {
w, h := i.image.Size()
w, h := i.Size()
if width <= 0 || height <= 0 {
panic("restorable: width/height must be positive")
}
@ -397,7 +407,7 @@ func (i *Image) readPixelsFromGPUIfNeeded() {
//
// Note that this must not be called until context is available.
func (i *Image) At(x, y int) (byte, byte, byte, byte) {
w, h := i.image.Size()
w, h := i.Size()
if x < 0 || y < 0 || w <= x || h <= y {
return 0, 0, 0, 0
}
@ -472,20 +482,21 @@ func (i *Image) hasDependency() bool {
}
// Restore restores *graphicscommand.Image from the pixels using its state.
func (i *Image) restore(width, height int) {
func (i *Image) restore() {
w, h := i.Size()
// Do not dispose the image here. The image should be already disposed.
if i.screen {
// The screen image should also be recreated because framebuffer might
// be changed.
i.image = graphicscommand.NewScreenFramebufferImage(width, height)
i.image = graphicscommand.NewScreenFramebufferImage(w, h)
i.basePixels = Pixels{}
i.drawTrianglesHistory = nil
i.stale = false
return
}
if i.volatile {
i.image = graphicscommand.NewImage(width, height)
i.image = graphicscommand.NewImage(w, h)
i.clear()
return
}
@ -493,7 +504,7 @@ func (i *Image) restore(width, height int) {
panic("restorable: pixels must not be stale when restoring")
}
gimg := graphicscommand.NewImage(width, height)
gimg := graphicscommand.NewImage(w, h)
// Clear the image explicitly.
if i != emptyImage {
// As clearImage uses emptyImage, clearImage cannot be called on emptyImage.
@ -511,7 +522,7 @@ func (i *Image) restore(width, height int) {
if len(i.drawTrianglesHistory) > 0 {
i.basePixels = Pixels{}
i.basePixels.AddOrReplace(gimg.Pixels(), 0, 0, width, height)
i.basePixels.AddOrReplace(gimg.Pixels(), 0, 0, w, h)
}
i.image = gimg

View File

@ -154,11 +154,7 @@ func (i *images) restore() {
// Dispose all the images ahead of restoring. A current texture ID and a new texture ID can be duplicated.
// TODO: Write a test to confirm that ID duplication never happens.
sizes := map[*Image]struct{ w, h int }{}
for i := range i.images {
// Keep the size before disposing i.image.
w, h := i.Size()
sizes[i] = struct{ w, h int }{w, h}
i.image.Dispose()
i.image = nil
}
@ -215,8 +211,7 @@ func (i *images) restore() {
}
for _, img := range sorted {
s := sizes[img]
img.restore(s.w, s.h)
img.restore()
}
}