fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-09 04:38:03 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

d3d12: Encode - Only upload headers when written headers size is > 0

Browse source 
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22091>
This commit is contained in:
Sil Vilerino 2023-03-23 11:31:32 -04:00 • committed by Marge Bot
parent cd575ff72b
commit 0016b8c9ea
1 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/gallium/drivers/d3d12/d3d12_video_enc.cpp
View file

@ -1526,7 +1526,8 @@ d3d12_video_encoder_encode_bitstream(struct pipe_video_codec * codec,
// If driver needs offset alignment for bitstream resource, we will pad zeroes on the codec header to this end.
if (
(pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment > 1)
(prefixGeneratedHeadersByteSize > 0)
&& (pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment > 1)
&& ((prefixGeneratedHeadersByteSize % pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment) != 0)
) {
prefixGeneratedHeadersByteSize = ALIGN(prefixGeneratedHeadersByteSize, pD3D12Enc->m_currentEncodeCapabilities.m_ResourceRequirementsCaps.CompressedBitstreamBufferAccessAlignment);
@ -1581,15 +1582,16 @@ d3d12_video_encoder_encode_bitstream(struct pipe_video_codec * codec,
// Store this info for get_feedback to be able to calculate final bitstream size
pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].codecHeadersSize = prefixGeneratedHeadersByteSize;
pD3D12Enc->base.context->buffer_subdata(
pD3D12Enc->base.context, // context
destination, // dst buffer - "destination" is the pipe_resource object
// wrapping pOutputBitstreamBuffer and eventually pOutputBufferD3D12Res
PIPE_MAP_WRITE, // usage PIPE_MAP_x
0, // offset
pD3D12Enc->m_BitstreamHeadersBuffer.size(),
pD3D12Enc->m_BitstreamHeadersBuffer.data());
if (prefixGeneratedHeadersByteSize > 0) {
pD3D12Enc->base.context->buffer_subdata(
pD3D12Enc->base.context, // context
destination, // dst buffer - "destination" is the pipe_resource object
// wrapping pOutputBitstreamBuffer and eventually pOutputBufferD3D12Res
PIPE_MAP_WRITE, // usage PIPE_MAP_x
0, // offset
pD3D12Enc->m_BitstreamHeadersBuffer.size(),
pD3D12Enc->m_BitstreamHeadersBuffer.data());
}
// Note: The buffer_subdata is queued in pD3D12Enc->base.context but doesn't execute immediately
// Will flush and sync this batch in d3d12_video_encoder_flush with the rest of the Video Encode Queue GPU work