From 2cf651bed8d3834f62b4466a018ffd628dbe5a2d Mon Sep 17 00:00:00 2001
From: Hajime Hoshi <hajimehoshi@gmail.com>
Date: Tue, 25 Oct 2022 00:35:07 +0900
Subject: [PATCH] internal/graphicsdriver/directx: resize the swap buffer chain
 at the end of a frame

Updates #2144
---
 .../directx/graphics_windows.go               | 49 ++++++-------------
 1 file changed, 14 insertions(+), 35 deletions(-)

diff --git a/internal/graphicsdriver/directx/graphics_windows.go b/internal/graphicsdriver/directx/graphics_windows.go
index ac7bfb0a8..4a6d73c90 100644
--- a/internal/graphicsdriver/directx/graphics_windows.go
+++ b/internal/graphicsdriver/directx/graphics_windows.go
@@ -148,6 +148,9 @@ type Graphics struct {
 	// lastTime is the last time for rendering.
 	lastTime time.Time
 
+	newScreenWidth  int
+	newScreenHeight int
+
 	pipelineStates
 }
 
@@ -533,9 +536,8 @@ func (g *Graphics) updateSwapChain(width, height int) error {
 		return errors.New("directx: resizing should never happen on Xbox")
 	}
 
-	if err := g.resizeSwapChainDesktop(width, height); err != nil {
-		return err
-	}
+	g.newScreenWidth = width
+	g.newScreenHeight = height
 
 	return nil
 }
@@ -644,19 +646,7 @@ func (g *Graphics) initSwapChainXbox(width, height int) (ferr error) {
 }
 
 func (g *Graphics) resizeSwapChainDesktop(width, height int) error {
-	if err := g.flushCommandList(g.copyCommandList); err != nil {
-		return err
-	}
-	if err := g.copyCommandList.Close(); err != nil {
-		return err
-	}
-	if err := g.flushCommandList(g.drawCommandList); err != nil {
-		return err
-	}
-	if err := g.drawCommandList.Close(); err != nil {
-		return err
-	}
-
+	// All resources must be released before ResizeBuffers.
 	if err := g.waitForCommandQueue(); err != nil {
 		return err
 	}
@@ -682,25 +672,6 @@ func (g *Graphics) resizeSwapChainDesktop(width, height int) error {
 		return err
 	}
 
-	// TODO: Reset 0 on Xbox
-	g.frameIndex = int(g.swapChain.GetCurrentBackBufferIndex())
-
-	// TODO: Are these resetting necessary?
-
-	if err := g.drawCommandAllocators[g.frameIndex].Reset(); err != nil {
-		return err
-	}
-	if err := g.drawCommandList.Reset(g.drawCommandAllocators[g.frameIndex], nil); err != nil {
-		return err
-	}
-
-	if err := g.copyCommandAllocators[g.frameIndex].Reset(); err != nil {
-		return err
-	}
-	if err := g.copyCommandList.Reset(g.copyCommandAllocators[g.frameIndex], nil); err != nil {
-		return err
-	}
-
 	return nil
 }
 
@@ -810,6 +781,14 @@ func (g *Graphics) End(present bool) error {
 			}
 		}
 
+		if g.newScreenWidth != 0 && g.newScreenHeight != 0 {
+			if err := g.resizeSwapChainDesktop(g.newScreenWidth, g.newScreenHeight); err != nil {
+				return err
+			}
+			g.newScreenWidth = 0
+			g.newScreenHeight = 0
+		}
+
 		if err := g.moveToNextFrame(); err != nil {
 			return err
 		}