internal/graphicsdriver/directx: resize the swap buffer chain at the end of a frame

Updates #2144
This commit is contained in:
Hajime Hoshi 2022-10-25 00:35:07 +09:00
parent f220eb729c
commit 2cf651bed8

View File

@ -148,6 +148,9 @@ type Graphics struct {
// lastTime is the last time for rendering. // lastTime is the last time for rendering.
lastTime time.Time lastTime time.Time
newScreenWidth int
newScreenHeight int
pipelineStates pipelineStates
} }
@ -533,9 +536,8 @@ func (g *Graphics) updateSwapChain(width, height int) error {
return errors.New("directx: resizing should never happen on Xbox") return errors.New("directx: resizing should never happen on Xbox")
} }
if err := g.resizeSwapChainDesktop(width, height); err != nil { g.newScreenWidth = width
return err g.newScreenHeight = height
}
return nil return nil
} }
@ -644,19 +646,7 @@ func (g *Graphics) initSwapChainXbox(width, height int) (ferr error) {
} }
func (g *Graphics) resizeSwapChainDesktop(width, height int) error { func (g *Graphics) resizeSwapChainDesktop(width, height int) error {
if err := g.flushCommandList(g.copyCommandList); err != nil { // All resources must be released before ResizeBuffers.
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
}
if err := g.waitForCommandQueue(); err != nil { if err := g.waitForCommandQueue(); err != nil {
return err return err
} }
@ -682,25 +672,6 @@ func (g *Graphics) resizeSwapChainDesktop(width, height int) error {
return err 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 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 { if err := g.moveToNextFrame(); err != nil {
return err return err
} }