AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

d3d12: Change d3d12_video_encoder to not automatically flush

Browse Source 
With PIPE_VIDEO_CAP_REQUIRES_FLUSH_ON_END_FRAME reported as 1, the frontend will call flush()

Reviewed-by: Giancarlo Devich <gdevich@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18715>
This commit is contained in:
Sil Vilerino
2022-09-20 11:21:48 -04:00
committed by Marge Bot
parent 59f2c71773
commit 29f2c5afbf
2 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/d3d12/d3d12_video_enc.cpp
+6 -13
View File
@@ -69,7 +69,7 @@ d3d12_video_encoder_flush(struct pipe_video_codec *codec)
pD3D12Enc->m_spEncodeCommandQueue->Wait(casted_completion_fence->cmdqueue_fence, casted_completion_fence->value);
pD3D12Enc->m_pD3D12Screen->base.fence_reference(&pD3D12Enc->m_pD3D12Screen->base, &completion_fence, NULL);
if (!pD3D12Enc->m_needsGPUFlush) {
if (!pD3D12Enc->m_bPendingWorkNotFlushed) {
debug_printf("[d3d12_video_encoder] d3d12_video_encoder_flush started. Nothing to flush, all up to date.\n");
} else {
debug_printf("[d3d12_video_encoder] d3d12_video_encoder_flush started. Will flush video queue work and CPU wait "
@@ -139,7 +139,7 @@ d3d12_video_encoder_flush(struct pipe_video_codec *codec)
pD3D12Enc->m_fenceValue);
pD3D12Enc->m_fenceValue++;
pD3D12Enc->m_needsGPUFlush = false;
pD3D12Enc->m_bPendingWorkNotFlushed = false;
}
return;
@@ -161,10 +161,11 @@ d3d12_video_encoder_destroy(struct pipe_video_codec *codec)
return;
}
d3d12_video_encoder_flush(codec); // Flush pending work before destroying.
struct d3d12_video_encoder *pD3D12Enc = (struct d3d12_video_encoder *) codec;
if(pD3D12Enc->m_bPendingWorkNotFlushed)
d3d12_video_encoder_flush(codec); // Flush pending work before destroying.
// Call d3d12_video_encoder dtor to make ComPtr and other member's destructors work
delete pD3D12Enc;
}
@@ -1550,10 +1551,6 @@ d3d12_video_encoder_get_feedback(struct pipe_video_codec *codec, void *feedback,
struct d3d12_video_encoder *pD3D12Enc = (struct d3d12_video_encoder *) codec;
assert(pD3D12Enc);
if (pD3D12Enc->m_needsGPUFlush) {
d3d12_video_encoder_flush(codec);
}
uint64_t requested_metadata_fence = ((uint64_t) feedback);
if((pD3D12Enc->m_fenceValue - requested_metadata_fence) > D3D12_VIDEO_ENC_METADATA_BUFFERS_COUNT)
@@ -1679,9 +1676,5 @@ d3d12_video_encoder_end_frame(struct pipe_video_codec * codec,
debug_printf("[d3d12_video_encoder] d3d12_video_encoder_end_frame finalized for fenceValue: %" PRIu64 "\n",
pD3D12Enc->m_fenceValue);
///
/// Flush work to the GPU and blocking wait until encode finishes
///
pD3D12Enc->m_needsGPUFlush = true;
d3d12_video_encoder_flush(codec);
pD3D12Enc->m_bPendingWorkNotFlushed = true;
}
src/gallium/drivers/d3d12/d3d12_video_enc.h
+1 -2
View File
@@ -123,6 +123,7 @@ struct d3d12_video_encoder
ComPtr<ID3D12Fence> m_spFence = {};
uint64_t m_fenceValue = 1u;
bool m_bPendingWorkNotFlushed = false;
ComPtr<ID3D12VideoDevice3> m_spD3D12VideoDevice = {};
ComPtr<ID3D12VideoEncoder> m_spVideoEncoder = {};
@@ -136,8 +137,6 @@ struct d3d12_video_encoder
std::unique_ptr<d3d12_video_dpb_storage_manager_interface> m_upDPBStorageManager = {};
std::unique_ptr<d3d12_video_bitstream_builder_interface> m_upBitstreamBuilder = {};
bool m_needsGPUFlush = false;
struct EncodedBitstreamResolvedMetadata
{
ComPtr<ID3D12Resource> spBuffer;