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

buffered: Refactoring: Flush delayed functions without the lock

Browse Source
This commit is contained in:
Hajime Hoshi 2020-02-16 19:24:26 +09:00
parent ff8689cfcd
commit 405ae99b32
2 changed files with 30 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
internal/buffered/command.go
View File

@ -29,19 +29,23 @@ var (
)
func flushDelayedCommands() error {
delayedCommandsM.Lock()
defer delayedCommandsM.Unlock()
if !needsToDelayCommands {
return nil
}
for _, c := range delayedCommands {
if err := c(); err != nil {
fs := getDelayedFuncsAndClear()
for _, f := range fs {
if err := f(); err != nil {
return err
}
}
delayedCommands = delayedCommands[:0]
needsToDelayCommands = false
return nil
}
func getDelayedFuncsAndClear() []func() error {
delayedCommandsM.Lock()
defer delayedCommandsM.Unlock()
fs := make([]func() error, len(delayedCommands))
copy(fs, delayedCommands)
delayedCommands = nil
needsToDelayCommands = false
return fs
}

33
internal/buffered/image.go
View File

@ -45,47 +45,47 @@ func EndFrame() error {
func NewImage(width, height int, volatile bool) *Image {
i := &Image{}
i.initialize(width, height, volatile)
return i
}
func (i *Image) initialize(width, height int, volatile bool) {
delayedCommandsM.Lock()
defer delayedCommandsM.Unlock()
if needsToDelayCommands {
delayedCommands = append(delayedCommands, func() error {
i.img = mipmap.New(width, height, volatile)
i.width = width
i.height = height
i.initialize(width, height, volatile)
return nil
})
return i
return
}
i.img = mipmap.New(width, height, volatile)
i.width = width
i.height = height
return i
}
func NewScreenFramebufferImage(width, height int) *Image {
i := &Image{}
i.initializeAsScreenFramebuffer(width, height)
return i
}
func (i *Image) initializeAsScreenFramebuffer(width, height int) {
delayedCommandsM.Lock()
defer delayedCommandsM.Unlock()
if needsToDelayCommands {
delayedCommands = append(delayedCommands, func() error {
i.img = mipmap.NewScreenFramebufferMipmap(width, height)
i.width = width
i.height = height
i.initializeAsScreenFramebuffer(width, height)
return nil
})
return i
return
}
i.img = mipmap.NewScreenFramebufferMipmap(width, height)
i.width = width
i.height = height
return i
}
func (i *Image) invalidatePendingPixels() {
@ -111,8 +111,7 @@ func (i *Image) MarkDisposed() {
if needsToDelayCommands {
delayedCommands = append(delayedCommands, func() error {
i.invalidatePendingPixels()
i.img.MarkDisposed()
i.MarkDisposed()
return nil
})
return
@ -188,8 +187,7 @@ func (i *Image) Fill(clr color.RGBA) {
if needsToDelayCommands {
delayedCommands = append(delayedCommands, func() error {
i.invalidatePendingPixels()
i.img.Fill(clr)
i.Fill(clr)
return nil
})
return
@ -205,10 +203,9 @@ func (i *Image) ReplacePixels(pix []byte) {
if needsToDelayCommands {
delayedCommands = append(delayedCommands, func() error {
i.invalidatePendingPixels()
copied := make([]byte, len(pix))
copy(copied, pix)
i.img.ReplacePixels(copied)
i.ReplacePixels(copied)
return nil
})
return