graphicsdriver/metal: Bug fix: Had to set the vsync state again at re…

…setting Fixes hajimehoshi#1364
momodezhou · Oct 13, 2020 · fe55854 · fe55854
1 parent 01be505
commit fe55854
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/examples/windowsize/main.go b/examples/windowsize/main.go
@@ -254,7 +254,12 @@ func (g *game) Update(screen *ebiten.Image) error {
 	ebiten.SetFullscreen(fullscreen)
 	ebiten.SetRunnableOnUnfocused(runnableOnUnfocused)
 	ebiten.SetCursorVisible(cursorVisible)
-	ebiten.SetVsyncEnabled(vsyncEnabled)
+
+	// Set vsync enabled only when this is needed.
+	// This makes a bug around vsync initialization more explicit (#1364).
+	if vsyncEnabled != ebiten.IsVsyncEnabled() {
+		ebiten.SetVsyncEnabled(vsyncEnabled)
+	}
 	ebiten.SetMaxTPS(tps)
 	ebiten.SetWindowDecorated(decorated)
 	ebiten.SetWindowPosition(positionX, positionY)

diff --git a/internal/graphicsdriver/metal/view.go b/internal/graphicsdriver/metal/view.go
@@ -28,6 +28,7 @@ type view struct {
 	uiview uintptr
 
 	windowChanged bool
+	vsync         bool
 
 	device mtl.Device
 	ml     ca.MetalLayer
@@ -48,6 +49,7 @@ func (v *view) setDisplaySyncEnabled(enabled bool) {
 	// recursive function call via Run is forbidden.
 	// Fix this to use d.t.Run to avoid confusion.
 	v.ml.SetDisplaySyncEnabled(enabled)
+	v.vsync = enabled
 }
 
 func (v *view) colorPixelFormat() mtl.PixelFormat {
@@ -70,6 +72,9 @@ func (v *view) reset() error {
 	// MTLPixelFormatBGRA10_XR_sRGB.
 	v.ml.SetPixelFormat(mtl.PixelFormatBGRA8UNorm)
 	v.ml.SetMaximumDrawableCount(3)
+
+	// The vsync state might be reset. Set the state again (#1364).
+	v.ml.SetDisplaySyncEnabled(v.vsync)
 	return nil
 }