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

d3d12: Replace size_t with uint64_t in d3d12_video_encoder definitions for cross-plat compatibility

Browse source 
Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18821>
This commit is contained in:
Sil Vilerino 2022-09-26 07:59:11 -04:00 • committed by Marge Bot
parent 7336580408
commit e884902b21
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1279,7 +1279,7 @@ fail:
}
void
d3d12_video_encoder_calculate_metadata_resolved_buffer_size(uint32_t maxSliceNumber, size_t &bufferSize)
d3d12_video_encoder_calculate_metadata_resolved_buffer_size(uint32_t maxSliceNumber, uint64_t &bufferSize)
{
bufferSize = sizeof(D3D12_VIDEO_ENCODER_OUTPUT_METADATA) +
(maxSliceNumber * sizeof(D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA));
@ -1727,7 +1727,7 @@ void
d3d12_video_encoder_extract_encode_metadata(
struct d3d12_video_encoder * pD3D12Enc,
ID3D12Resource * pResolvedMetadataBuffer, // input
size_t resourceMetadataSize, // input
uint64_t resourceMetadataSize, // input
D3D12_VIDEO_ENCODER_OUTPUT_METADATA & parsedMetadata, // output
std::vector<D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA> &pSubregionsMetadata // output
)
@ -1765,7 +1765,7 @@ d3d12_video_encoder_extract_encode_metadata(
memset(&parsedMetadata, 0, sizeof(D3D12_VIDEO_ENCODER_OUTPUT_METADATA));
// Calculate sizes
size_t encoderMetadataSize = sizeof(D3D12_VIDEO_ENCODER_OUTPUT_METADATA);
uint64_t encoderMetadataSize = sizeof(D3D12_VIDEO_ENCODER_OUTPUT_METADATA);
// Copy buffer to the appropriate D3D12_VIDEO_ENCODER_OUTPUT_METADATA memory layout
parsedMetadata = *reinterpret_cast<D3D12_VIDEO_ENCODER_OUTPUT_METADATA *>(pMetadataBufferSrc);

8
src/gallium/drivers/d3d12/d3d12_video_enc.h
View file

@ -253,8 +253,8 @@ struct d3d12_video_encoder
struct EncodedBitstreamResolvedMetadata
{
ComPtr<ID3D12Resource> spBuffer;
size_t bufferSize = 0;
size_t codecHeadersSize = 0;
uint64_t bufferSize = 0;
uint64_t codecHeadersSize = 0;
ComPtr<ID3D12Resource> m_spMetadataOutputBuffer;
};
@ -317,7 +317,7 @@ d3d12_video_encoder_update_picparams_tracking(struct d3d12_video_encoder *pD3D12
struct pipe_video_buffer * srcTexture,
struct pipe_picture_desc * picture);
void
d3d12_video_encoder_calculate_metadata_resolved_buffer_size(uint32_t maxSliceNumber, size_t &bufferSize);
d3d12_video_encoder_calculate_metadata_resolved_buffer_size(uint32_t maxSliceNumber, uint64_t &bufferSize);
uint32_t
d3d12_video_encoder_calculate_max_slices_count_in_output(
D3D12_VIDEO_ENCODER_FRAME_SUBREGION_LAYOUT_MODE slicesMode,
@ -335,7 +335,7 @@ void
d3d12_video_encoder_extract_encode_metadata(
struct d3d12_video_encoder * pD3D12Dec,
ID3D12Resource * pResolvedMetadataBuffer,
size_t resourceMetadataSize,
uint64_t resourceMetadataSize,
D3D12_VIDEO_ENCODER_OUTPUT_METADATA & encoderMetadata,
std::vector<D3D12_VIDEO_ENCODER_FRAME_SUBREGION_METADATA> &pSubregionsMetadata);