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

graphics: Dispose now returns errors

Browse Source
This commit is contained in:
Hajime Hoshi 2016-05-07 23:34:10 +09:00
parent 57a9ecd821
commit 2fee1fae22
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
image.go
View File

@ -182,11 +182,15 @@ func (i *Image) Dispose() error {
return errors.New("ebiten: image is already disposed") return errors.New("ebiten: image is already disposed")
} }
if i.framebuffer != nil { if i.framebuffer != nil {
i.framebuffer.Dispose(glContext) if err := i.framebuffer.Dispose(glContext); err != nil {
return err
}
i.framebuffer = nil i.framebuffer = nil
} }
if i.texture != nil { if i.texture != nil {
i.texture.Dispose(glContext) if err := i.texture.Dispose(glContext); err != nil {
return err
}
i.texture = nil i.texture = nil
} }
i.pixels = nil i.pixels = nil

5
internal/graphics/framebuffer.go
View File

@ -69,12 +69,13 @@ func (f *Framebuffer) Size() (width, height int) {
return f.width, f.height return f.width, f.height
} }
func (f *Framebuffer) Dispose(c *opengl.Context) { func (f *Framebuffer) Dispose(c *opengl.Context) error {
// Don't delete the default framebuffer. // Don't delete the default framebuffer.
if f.native == opengl.ZeroFramebuffer { if f.native == opengl.ZeroFramebuffer {
return return nil
} }
c.DeleteFramebuffer(f.native) c.DeleteFramebuffer(f.native)
return nil
} }
func (f *Framebuffer) setAsViewport(c *opengl.Context) error { func (f *Framebuffer) setAsViewport(c *opengl.Context) error {

3
internal/graphics/texture.go
View File

@ -86,6 +86,7 @@ func NewTextureFromImage(c *opengl.Context, img image.Image, filter opengl.Filte
return &Texture{native, origSize.X, origSize.Y}, nil return &Texture{native, origSize.X, origSize.Y}, nil
} }
func (t *Texture) Dispose(c *opengl.Context) { func (t *Texture) Dispose(c *opengl.Context) error {
c.DeleteTexture(t.native) c.DeleteTexture(t.native)
return nil
} }