mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-25 03:08:54 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/restorable: reduce allocations at readPixelsFromGPU

Browse Source 
Updates #2375
This commit is contained in:
Hajime Hoshi 2023-03-08 16:40:47 +09:00
parent da55397420
commit 22d74e78b2
1 changed files with 18 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
internal/restorable/image.go
View File

@ -128,11 +128,14 @@ type Image struct {
// pixelsCache is just a cache to avoid allocations (#2375). // pixelsCache is just a cache to avoid allocations (#2375).
// //
// A key is the region and a value is a byte slice for the region. // A key is the region and a value is a byte slice for the region.
//
// It is fine to reuse the same byte slice for the same region for basePixels,
// as old pixels for the same region will be invalidated at basePixel.AddOrReplace.
pixelsCache map[image.Rectangle][]byte pixelsCache map[image.Rectangle][]byte
// regionsForRestore is cached regions. // regionsCache is cached regions.
// regionsForRestore is just a cache to avoid allocations (#2375). // regionsCache is just a cache to avoid allocations (#2375).
regionsForRestore []image.Rectangle regionsCache []image.Rectangle
imageType ImageType imageType ImageType
} }
@ -474,9 +477,13 @@ func (i *Image) makeStaleIfDependingOnShader(shader *Shader) {
func (i *Image) readPixelsFromGPU(graphicsDriver graphicsdriver.Graphics) error { func (i *Image) readPixelsFromGPU(graphicsDriver graphicsdriver.Graphics) error {
var rs []image.Rectangle var rs []image.Rectangle
if i.stale { if i.stale {
rs = append(rs, i.staleRegions...) rs = i.staleRegions
} else { } else {
rs = i.appendRegionsForDrawTriangles(rs) i.regionsCache = i.appendRegionsForDrawTriangles(i.regionsCache)
defer func() {
i.regionsCache = i.regionsCache[:0]
}()
rs = i.regionsCache
} }
for _, r := range rs { for _, r := range rs {
@ -498,6 +505,7 @@ func (i *Image) readPixelsFromGPU(graphicsDriver graphicsdriver.Graphics) error
} }
i.basePixels.AddOrReplace(pix, r.Min.X, r.Min.Y, r.Dx(), r.Dy()) i.basePixels.AddOrReplace(pix, r.Min.X, r.Min.Y, r.Dx(), r.Dy())
} }
i.clearDrawTrianglesHistory() i.clearDrawTrianglesHistory()
i.stale = false i.stale = false
i.staleRegions = i.staleRegions[:0] i.staleRegions = i.staleRegions[:0]
@ -612,9 +620,12 @@ func (i *Image) restore(graphicsDriver graphicsdriver.Graphics) error {
// In order to clear the draw-triangles history, read pixels from GPU. // In order to clear the draw-triangles history, read pixels from GPU.
if len(i.drawTrianglesHistory) > 0 { if len(i.drawTrianglesHistory) > 0 {
i.regionsForRestore = i.appendRegionsForDrawTriangles(i.regionsForRestore) i.regionsCache = i.appendRegionsForDrawTriangles(i.regionsCache)
defer func() {
i.regionsCache = i.regionsCache[:0]
}()
for _, r := range i.regionsForRestore { for _, r := range i.regionsCache {
if r.Empty() { if r.Empty() {
continue continue
} }
@ -633,8 +644,6 @@ func (i *Image) restore(graphicsDriver graphicsdriver.Graphics) error {
} }
i.basePixels.AddOrReplace(pix, r.Min.X, r.Min.Y, r.Dx(), r.Dy()) i.basePixels.AddOrReplace(pix, r.Min.X, r.Min.Y, r.Dx(), r.Dy())
} }
i.regionsForRestore = i.regionsForRestore[:0]
} }
i.image = gimg i.image = gimg