mirror/rt64
1
0
Fork 0
mirror of https://github.com/rt64/rt64.git synced 2024-12-26 21:18:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

D3D12: Fix bogus warning for sample positions.

Browse Source
This commit is contained in:
Dario 2024-07-21 19:04:22 -03:00
parent f10ad63044
commit d864d7ab9b
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/d3d12/rt64_d3d12.cpp
View File

@ -1343,7 +1343,10 @@ namespace RT64 {
void D3D12CommandList::end() { void D3D12CommandList::end() {
assert(open); assert(open);
// It's required to reset the sample positions before the command list ends.
resetSamplePositions();
d3d->Close(); d3d->Close();
open = false; open = false;
targetFramebuffer = nullptr; targetFramebuffer = nullptr;
@ -1352,7 +1355,6 @@ namespace RT64 {
activeGraphicsPipelineLayout = nullptr; activeGraphicsPipelineLayout = nullptr;
activeGraphicsPipeline = nullptr; activeGraphicsPipeline = nullptr;
activeTopology = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED; activeTopology = D3D_PRIMITIVE_TOPOLOGY_UNDEFINED;
activeSamplePositions = false;
descriptorHeapsSet = false; descriptorHeapsSet = false;
} }
@ -1413,12 +1415,11 @@ namespace RT64 {
if (msaaDepthTarget && interfaceTexture->desc.multisampling.sampleLocationsEnabled) { if (msaaDepthTarget && interfaceTexture->desc.multisampling.sampleLocationsEnabled) {
setSamplePositions(interfaceTexture); setSamplePositions(interfaceTexture);
d3d->ResourceBarrier(1, &resourceBarrier); d3d->ResourceBarrier(1, &resourceBarrier);
resetSamplePositionsRequired = true;
} }
else { else {
barrierVector.emplace_back(resourceBarrier); barrierVector.emplace_back(resourceBarrier);
} }
resetSamplePositionsRequired = resetSamplePositionsRequired || msaaDepthTarget;
} }
if (resetSamplePositionsRequired) { if (resetSamplePositionsRequired) {