From 6d6974854299cc3d65e86078a5f2b106f797a081 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Thu, 22 Aug 2024 16:22:32 +0200 Subject: [PATCH] d3d12: Remove get_feedback_fence implementation The function signature and semantics will be changed in next commit. Reviewed-By: Sil Vilerino Part-of: --- src/gallium/drivers/d3d12/d3d12_video_enc.cpp | 19 ------------------- src/gallium/drivers/d3d12/d3d12_video_enc.h | 8 -------- 2 files changed, 27 deletions(-) diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp index be7f1215a57..279966822c1 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.cpp +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.cpp @@ -1596,7 +1596,6 @@ d3d12_video_encoder_create_encoder(struct pipe_context *context, const struct pi pD3D12Enc->base.end_frame = d3d12_video_encoder_end_frame; pD3D12Enc->base.flush = d3d12_video_encoder_flush; pD3D12Enc->base.get_encode_headers = d3d12_video_encoder_get_encode_headers; - pD3D12Enc->base.get_feedback_fence = d3d12_video_encoder_get_feedback_fence; pD3D12Enc->base.get_feedback = d3d12_video_encoder_get_feedback; struct d3d12_context *pD3D12Ctx = (struct d3d12_context *) context; @@ -2642,24 +2641,6 @@ d3d12_video_encoder_store_current_picture_references(d3d12_video_encoder *pD3D12 } } -struct pipe_fence_handle* -d3d12_video_encoder_get_feedback_fence(struct pipe_video_codec *codec, void *feedback) -{ - struct d3d12_video_encoder *pD3D12Enc = (struct d3d12_video_encoder *) codec; - struct d3d12_fence *feedback_fence = (struct d3d12_fence *) feedback; - uint64_t requested_metadata_fence = feedback_fence->value; - uint64_t current_metadata_slot = (requested_metadata_fence % D3D12_VIDEO_ENC_METADATA_BUFFERS_COUNT); - if (pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].encode_result & PIPE_VIDEO_FEEDBACK_METADATA_ENCODE_FLAG_FAILED) { - debug_printf("Error: d3d12_video_encoder_get_feedback_fence failed for Encode GPU command for fence %" PRIu64 " failed on submission with encode_result: %x\n", - requested_metadata_fence, - pD3D12Enc->m_spEncodedFrameMetadata[current_metadata_slot].encode_result); - assert(false); - return NULL; - } - - return (pipe_fence_handle*) feedback; -} - int d3d12_video_encoder_get_encode_headers([[maybe_unused]] struct pipe_video_codec *codec, [[maybe_unused]] struct pipe_picture_desc *picture, [[maybe_unused]] void* bitstream_buf, diff --git a/src/gallium/drivers/d3d12/d3d12_video_enc.h b/src/gallium/drivers/d3d12/d3d12_video_enc.h index 64bbe062f2e..6b692f92e5f 100644 --- a/src/gallium/drivers/d3d12/d3d12_video_enc.h +++ b/src/gallium/drivers/d3d12/d3d12_video_enc.h @@ -69,14 +69,6 @@ int d3d12_video_encoder_get_encode_headers(struct pipe_video_codec *codec, struct pipe_picture_desc *picture, void* bitstream_buf, unsigned *bitstream_buf_size); -/** - * Get feedback fence. - * - * Can be used to wait on the pipe_fence_handle directly instead - * of waiting on the get_feedback blocking call - */ -struct pipe_fence_handle* -d3d12_video_encoder_get_feedback_fence(struct pipe_video_codec *codec, void *feedback); /** * get encoder feedback