mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-11-14 15:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

buffered: Bug fix: Race condition at checkDealeydCommandsNil

Browse Source 
This change also renames checkDealeydCommandsNil to
checkDealeydCommandsFlushed, which makes more sense.

Updates #1195
This commit is contained in:
Hajime Hoshi 2020-06-17 03:19:31 +09:00
parent 2869885816
commit 0beddf5519
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/buffered/command.go
View File

@ -89,8 +89,8 @@ func tryAddDelayedCommandSlow(f func(obj interface{}) error, ondelayed func() in
} }
} }
func checkDelayedCommandsNil(fname string) { func checkDelayedCommandsFlushed(fname string) {
if delayedCommands != nil { if atomic.LoadUint32(&delayedCommandsFlushed) == 0 {
panic("buffered: the command queue is not available yet at " + fname) panic("buffered: the command queue is not available yet at " + fname)
} }
} }

4
internal/buffered/image.go
View File

@ -125,7 +125,7 @@ func (i *Image) MarkDisposed() {
} }
func (img *Image) Pixels(x, y, width, height int) (pix []byte, err error) { func (img *Image) Pixels(x, y, width, height int) (pix []byte, err error) {
checkDelayedCommandsNil("Pixels") checkDelayedCommandsFlushed("Pixels")
if !image.Rect(x, y, x+width, y+height).In(image.Rect(0, 0, img.width, img.height)) { if !image.Rect(x, y, x+width, y+height).In(image.Rect(0, 0, img.width, img.height)) {
return nil, fmt.Errorf("buffered: out of range") return nil, fmt.Errorf("buffered: out of range")
@ -160,7 +160,7 @@ func (img *Image) Pixels(x, y, width, height int) (pix []byte, err error) {
} }
func (i *Image) Dump(name string, blackbg bool) error { func (i *Image) Dump(name string, blackbg bool) error {
checkDelayedCommandsNil("Dump") checkDelayedCommandsFlushed("Dump")
return i.img.Dump(name, blackbg) return i.img.Dump(name, blackbg)
} }