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

graphicsdriver/metal: Set and reset screenDrawable more correctly

Browse Source
This commit is contained in:
Hajime Hoshi 2019-04-20 15:47:27 +09:00
parent a064955a13
commit 72be1bde24
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
internal/graphicsdriver/metal/driver.go
View File

@ -312,16 +312,25 @@ func Get() *Driver {
} }
func (d *Driver) Begin() { func (d *Driver) Begin() {
mainthread.Run(func() error {
// NSAutoreleasePool is required to release drawable correctly (#847). // NSAutoreleasePool is required to release drawable correctly (#847).
// https://developer.apple.com/library/archive/documentation/3DDrawing/Conceptual/MTLBestPracticesGuide/Drawables.html // https://developer.apple.com/library/archive/documentation/3DDrawing/Conceptual/MTLBestPracticesGuide/Drawables.html
mainthread.Run(func() error {
d.pool = C.allocAutoreleasePool() d.pool = C.allocAutoreleasePool()
drawable, err := d.ml.NextDrawable()
if err != nil {
// Drawable is nil. This can happen at the initial state. Let's wait and see.
return nil
}
d.screenDrawable = drawable
return nil return nil
}) })
} }
func (d *Driver) End() { func (d *Driver) End() {
mainthread.Run(func() error { mainthread.Run(func() error {
d.screenDrawable = ca.MetalDrawable{}
C.releaseAutoreleasePool(d.pool) C.releaseAutoreleasePool(d.pool)
d.pool = nil d.pool = nil
return nil return nil
@ -361,6 +370,8 @@ func (d *Driver) flush(wait bool) {
return nil return nil
} }
// TODO: Calling PresentDrawable here is odd since flush is not related to preseinging.
// Call it at End().
if d.screenDrawable != (ca.MetalDrawable{}) { if d.screenDrawable != (ca.MetalDrawable{}) {
d.cb.PresentDrawable(d.screenDrawable) d.cb.PresentDrawable(d.screenDrawable)
} }
@ -370,7 +381,6 @@ func (d *Driver) flush(wait bool) {
} }
d.cb = mtl.CommandBuffer{} d.cb = mtl.CommandBuffer{}
d.screenDrawable = ca.MetalDrawable{}
return nil return nil
}) })
@ -622,16 +632,8 @@ func (d *Driver) Draw(indexLen int, indexOffset int, mode graphics.CompositeMode
} }
var t mtl.Texture var t mtl.Texture
if d.dst.screen { if d.dst.screen {
if d.screenDrawable == (ca.MetalDrawable{}) {
drawable, err := d.ml.NextDrawable()
if err != nil {
return err
}
d.screenDrawable = drawable
}
t = d.screenDrawable.Texture() t = d.screenDrawable.Texture()
} else { } else {
d.screenDrawable = ca.MetalDrawable{}
t = d.dst.texture t = d.dst.texture
} }
rpd.ColorAttachments[0].Texture = t rpd.ColorAttachments[0].Texture = t