mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2025-01-27 03:02:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

graphics: Bug fix: need more locks for imageImpl

Browse Source
This commit is contained in:
Hajime Hoshi 2016-07-04 01:50:58 +09:00
parent 55bfe19bf8
commit cf093513be
1 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
imageimpl.go
View File

@ -43,7 +43,7 @@ type imageImpl struct {
func (i *imageImpl) Fill(clr color.Color) error { func (i *imageImpl) Fill(clr color.Color) error {
i.m.Lock() i.m.Lock()
defer i.m.Unlock() defer i.m.Unlock()
if i.isDisposed() { if i.disposed {
return errors.New("ebiten: image is already disposed") return errors.New("ebiten: image is already disposed")
} }
i.pixels = nil i.pixels = nil
@ -78,7 +78,7 @@ func (i *imageImpl) DrawImage(image *Image, options *DrawImageOptions) error {
} }
i.m.Lock() i.m.Lock()
defer i.m.Unlock() defer i.m.Unlock()
if i.isDisposed() { if i.disposed {
return errors.New("ebiten: image is already disposed") return errors.New("ebiten: image is already disposed")
} }
i.pixels = nil i.pixels = nil
@ -97,7 +97,7 @@ func (i *imageImpl) At(x, y int) color.Color {
} }
i.m.Lock() i.m.Lock()
defer i.m.Unlock() defer i.m.Unlock()
if i.isDisposed() { if i.disposed {
return color.Transparent return color.Transparent
} }
if i.pixels == nil { if i.pixels == nil {
@ -113,6 +113,8 @@ func (i *imageImpl) At(x, y int) color.Color {
} }
func (i *imageImpl) savePixels(context *opengl.Context) error { func (i *imageImpl) savePixels(context *opengl.Context) error {
i.m.Lock()
defer i.m.Unlock()
if i.noSave { if i.noSave {
return nil return nil
} }
@ -131,6 +133,8 @@ func (i *imageImpl) savePixels(context *opengl.Context) error {
} }
func (i *imageImpl) restorePixels() error { func (i *imageImpl) restorePixels() error {
i.m.Lock()
defer i.m.Unlock()
if i.screen { if i.screen {
return nil return nil
} }
@ -160,7 +164,7 @@ func (i *imageImpl) restorePixels() error {
func (i *imageImpl) Dispose() error { func (i *imageImpl) Dispose() error {
i.m.Lock() i.m.Lock()
defer i.m.Unlock() defer i.m.Unlock()
if i.isDisposed() { if i.disposed {
return errors.New("ebiten: image is already disposed") return errors.New("ebiten: image is already disposed")
} }
if err := i.image.Dispose(); err != nil { if err := i.image.Dispose(); err != nil {
@ -173,10 +177,6 @@ func (i *imageImpl) Dispose() error {
return nil return nil
} }
func (i *imageImpl) isDisposed() bool {
return i.disposed
}
func (i *imageImpl) ReplacePixels(p []uint8) error { func (i *imageImpl) ReplacePixels(p []uint8) error {
if l := 4 * i.width * i.height; len(p) != l { if l := 4 * i.width * i.height; len(p) != l {
return fmt.Errorf("ebiten: p's length must be %d", l) return fmt.Errorf("ebiten: p's length must be %d", l)
@ -187,12 +187,20 @@ func (i *imageImpl) ReplacePixels(p []uint8) error {
i.pixels = make([]uint8, len(p)) i.pixels = make([]uint8, len(p))
} }
copy(i.pixels, p) copy(i.pixels, p)
if i.isDisposed() { if i.disposed {
return errors.New("ebiten: image is already disposed") return errors.New("ebiten: image is already disposed")
} }
return i.image.ReplacePixels(p) return i.image.ReplacePixels(p)
} }
func (i *imageImpl) isDisposed() bool {
i.m.Lock()
defer i.m.Unlock()
return i.disposed
}
func (i *imageImpl) isInvalidated(context *opengl.Context) bool { func (i *imageImpl) isInvalidated(context *opengl.Context) bool {
i.m.Lock()
defer i.m.Unlock()
return i.image.IsInvalidated(context) return i.image.IsInvalidated(context)
} }