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

image: NewImage/NewImageFromImage are now cocurrent-safe (#201)

Browse Source
This commit is contained in:
Hajime Hoshi 2016-04-06 11:11:31 +09:00
parent 922fc7edfc
commit bcf406f058
1 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
image.go
View File

@ -20,14 +20,19 @@ import (
"image" "image"
"image/color" "image/color"
"runtime" "runtime"
"sync"
"github.com/hajimehoshi/ebiten/internal/graphics" "github.com/hajimehoshi/ebiten/internal/graphics"
"github.com/hajimehoshi/ebiten/internal/graphics/opengl" "github.com/hajimehoshi/ebiten/internal/graphics/opengl"
) )
var imageM sync.RWMutex
// Image represents an image. // Image represents an image.
// The pixel format is alpha-premultiplied. // The pixel format is alpha-premultiplied.
// Image implements image.Image. // Image implements image.Image.
//
// Note that manipulating an Image is NOT concurrent-safe (so far).
type Image struct { type Image struct {
framebuffer *graphics.Framebuffer framebuffer *graphics.Framebuffer
texture *graphics.Texture texture *graphics.Texture
@ -170,6 +175,8 @@ func (i *Image) isDisposed() bool {
// //
// This function may be slow (as for implementation, this calls glTexSubImage2D). // This function may be slow (as for implementation, this calls glTexSubImage2D).
func (i *Image) ReplacePixels(p []uint8) error { func (i *Image) ReplacePixels(p []uint8) error {
imageM.Lock()
defer imageM.Unlock()
if i.isDisposed() { if i.isDisposed() {
return errors.New("image is already disposed") return errors.New("image is already disposed")
} }
@ -200,7 +207,12 @@ type DrawImageOptions struct {
// Be careful that image objects will never be released // Be careful that image objects will never be released
// even though nothing refers the image object and GC works. // even though nothing refers the image object and GC works.
// It is because there is no way to define finalizers for Go objects if you use GopherJS. // It is because there is no way to define finalizers for Go objects if you use GopherJS.
//
// This function is concurrent-safe.
func NewImage(width, height int, filter Filter) (*Image, error) { func NewImage(width, height int, filter Filter) (*Image, error) {
imageM.Lock()
defer imageM.Unlock()
texture, err := graphics.NewTexture(glContext, width, height, glFilter(glContext, filter)) texture, err := graphics.NewTexture(glContext, width, height, glFilter(glContext, filter))
if err != nil { if err != nil {
return nil, err return nil, err
@ -224,7 +236,12 @@ func NewImage(width, height int, filter Filter) (*Image, error) {
// Be careful that image objects will never be released // Be careful that image objects will never be released
// even though nothing refers the image object and GC works. // even though nothing refers the image object and GC works.
// It is because there is no way to define finalizers for Go objects if you use GopherJS. // It is because there is no way to define finalizers for Go objects if you use GopherJS.
//
// This function is concurrent-safe.
func NewImageFromImage(img image.Image, filter Filter) (*Image, error) { func NewImageFromImage(img image.Image, filter Filter) (*Image, error) {
imageM.Lock()
defer imageM.Unlock()
texture, err := graphics.NewTextureFromImage(glContext, img, glFilter(glContext, filter)) texture, err := graphics.NewTextureFromImage(glContext, img, glFilter(glContext, filter))
if err != nil { if err != nil {
return nil, err return nil, err