diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp index 695b34b133a..ce88a026313 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp @@ -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 &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(pMetadataBufferSrc); diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.h b/src/gallium/drivers/d3d12/d3d12_video_enc.h index ffa52f31f2e..9a9c40bbddd 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.h +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.h @@ -253,8 +253,8 @@ struct d3d12_video_encoder struct EncodedBitstreamResolvedMetadata { ComPtr spBuffer; - size_t bufferSize = 0; - size_t codecHeadersSize = 0; + uint64_t bufferSize = 0; + uint64_t codecHeadersSize = 0; ComPtr 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 &pSubregionsMetadata);