mth/ebiten
1
0
Fork 0
mirror of https://github.com/hajimehoshi/ebiten.git synced 2024-12-26 03:38:55 +01:00
Code Issues Packages Projects Releases Wiki Activity

internal/graphicsdriver/directx: bug fix: clear constant buffers at the end of DrawTriangles

Browse Source 
Constant buffers should not be reset while a stencil buffer is used.

Closes #2138
This commit is contained in:
Hajime Hoshi 2022-06-19 17:13:22 +09:00
parent ac802cf0d0
commit 08c8c8089a
1 changed files with 22 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
internal/graphicsdriver/directx/graphics_windows.go
View File

@ -1130,14 +1130,20 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
}, },
}) })
setIndices := func() { if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
g.drawCommandList.IASetPrimitiveTopology(_D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST) return err
g.drawCommandList.IASetIndexBuffer(&_D3D12_INDEX_BUFFER_VIEW{
BufferLocation: g.indices[g.frameIndex][len(g.indices[g.frameIndex])-1].GetGPUVirtualAddress(),
SizeInBytes: graphics.IndicesNum * uint32(unsafe.Sizeof(uint16(0))),
Format: _DXGI_FORMAT_R16_UINT,
})
} }
if evenOdd {
if err := dst.clearStencilBuffer(g.device); err != nil {
return err
}
}
g.drawCommandList.IASetPrimitiveTopology(_D3D_PRIMITIVE_TOPOLOGY_TRIANGLELIST)
g.drawCommandList.IASetIndexBuffer(&_D3D12_INDEX_BUFFER_VIEW{
BufferLocation: g.indices[g.frameIndex][len(g.indices[g.frameIndex])-1].GetGPUVirtualAddress(),
SizeInBytes: graphics.IndicesNum * uint32(unsafe.Sizeof(uint16(0))),
Format: _DXGI_FORMAT_R16_UINT,
})
if shader == nil { if shader == nil {
key := builtinPipelineStatesKey{ key := builtinPipelineStatesKey{
@ -1149,14 +1155,6 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
} }
if evenOdd { if evenOdd {
if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
return err
}
if err := dst.clearStencilBuffer(g.device); err != nil {
return err
}
setIndices()
key.stencilMode = prepareStencil key.stencilMode = prepareStencil
s, err := g.pipelineStates.builtinGraphicsPipelineState(g.device, key) s, err := g.pipelineStates.builtinGraphicsPipelineState(g.device, key)
if err != nil { if err != nil {
@ -1166,11 +1164,6 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
return err return err
} }
if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
return err
}
setIndices()
key.stencilMode = drawWithStencil key.stencilMode = drawWithStencil
s, err = g.pipelineStates.builtinGraphicsPipelineState(g.device, key) s, err = g.pipelineStates.builtinGraphicsPipelineState(g.device, key)
if err != nil { if err != nil {
@ -1180,11 +1173,6 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
return err return err
} }
} else { } else {
if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
return err
}
setIndices()
key.stencilMode = noStencil key.stencilMode = noStencil
s, err := g.pipelineStates.builtinGraphicsPipelineState(g.device, key) s, err := g.pipelineStates.builtinGraphicsPipelineState(g.device, key)
if err != nil { if err != nil {
@ -1197,14 +1185,6 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
} else { } else {
if evenOdd { if evenOdd {
if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
return err
}
if err := dst.clearStencilBuffer(g.device); err != nil {
return err
}
setIndices()
s, err := shader.pipelineState(mode, prepareStencil) s, err := shader.pipelineState(mode, prepareStencil)
if err != nil { if err != nil {
return err return err
@ -1213,11 +1193,6 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
return err return err
} }
if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
return err
}
setIndices()
s, err = shader.pipelineState(mode, drawWithStencil) s, err = shader.pipelineState(mode, drawWithStencil)
if err != nil { if err != nil {
return err return err
@ -1226,11 +1201,6 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
return err return err
} }
} else { } else {
if err := dst.setAsRenderTarget(g.device, evenOdd); err != nil {
return err
}
setIndices()
s, err := shader.pipelineState(mode, noStencil) s, err := shader.pipelineState(mode, noStencil)
if err != nil { if err != nil {
return err return err
@ -1241,6 +1211,15 @@ func (g *Graphics) DrawTriangles(dstID graphicsdriver.ImageID, srcs [graphics.Sh
} }
} }
// Release constant buffers when too many ones were created.
// This is needed espciallly for testings, where present is always false.
if len(g.pipelineStates.constantBuffers[g.frameIndex]) >= 16 {
if err := g.flushCommandList(g.drawCommandList); err != nil {
return err
}
g.pipelineStates.releaseConstantBuffers(g.frameIndex)
}
return nil return nil
} }
@ -1251,15 +1230,6 @@ func (g *Graphics) drawTriangles(pipelineState *_ID3D12PipelineState, srcs [grap
g.drawCommandList.DrawIndexedInstanced(uint32(indexLen), 1, uint32(indexOffset), 0, 0) g.drawCommandList.DrawIndexedInstanced(uint32(indexLen), 1, uint32(indexOffset), 0, 0)
// Release constant buffers when too many ones were created.
// This is needed espciallly for testings, where present is always false.
if len(g.pipelineStates.constantBuffers[g.frameIndex]) >= 16 {
if err := g.flushCommandList(g.drawCommandList); err != nil {
return err
}
g.pipelineStates.releaseConstantBuffers(g.frameIndex)
}
return nil return nil
} }