diff --git a/spa/plugins/vulkan/vulkan-compute-utils.c b/spa/plugins/vulkan/vulkan-compute-utils.c index 73e6d6a21..37106af2f 100644 --- a/spa/plugins/vulkan/vulkan-compute-utils.c +++ b/spa/plugins/vulkan/vulkan-compute-utils.c @@ -543,6 +543,17 @@ int spa_vulkan_compute_use_buffers(struct vulkan_compute_state *s, struct vulkan return 0; } +static int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction, + struct spa_dict *props) +{ + spa_zero(*stream); + stream->direction = direction; + stream->current_buffer_id = SPA_ID_INVALID; + stream->busy_buffer_id = SPA_ID_INVALID; + stream->ready_buffer_id = SPA_ID_INVALID; + return 0; +} + int spa_vulkan_compute_init_stream(struct vulkan_compute_state *s, struct vulkan_stream *stream, enum spa_direction direction, struct spa_dict *props) { diff --git a/spa/plugins/vulkan/vulkan-compute-utils.h b/spa/plugins/vulkan/vulkan-compute-utils.h index 0c6b585f4..46e80455c 100644 --- a/spa/plugins/vulkan/vulkan-compute-utils.h +++ b/spa/plugins/vulkan/vulkan-compute-utils.h @@ -24,6 +24,18 @@ struct push_constants { int height; }; +struct vulkan_stream { + enum spa_direction direction; + + uint32_t pending_buffer_id; + uint32_t current_buffer_id; + uint32_t busy_buffer_id; + uint32_t ready_buffer_id; + + struct vulkan_buffer buffers[MAX_BUFFERS]; + struct spa_buffer *spa_buffers[MAX_BUFFERS]; + uint32_t n_buffers; +}; struct vulkan_compute_state { struct spa_log *log; diff --git a/spa/plugins/vulkan/vulkan-types.h b/spa/plugins/vulkan/vulkan-types.h index 8fd4be363..f28618774 100644 --- a/spa/plugins/vulkan/vulkan-types.h +++ b/spa/plugins/vulkan/vulkan-types.h @@ -33,19 +33,6 @@ struct vulkan_buffer { VkSemaphore foreign_semaphore; }; -struct vulkan_stream { - enum spa_direction direction; - - uint32_t pending_buffer_id; - uint32_t current_buffer_id; - uint32_t busy_buffer_id; - uint32_t ready_buffer_id; - - struct vulkan_buffer buffers[MAX_BUFFERS]; - struct spa_buffer *spa_buffers[MAX_BUFFERS]; - uint32_t n_buffers; -}; - struct vulkan_base_info { uint32_t queueFlags; diff --git a/spa/plugins/vulkan/vulkan-utils.c b/spa/plugins/vulkan/vulkan-utils.c index c7c961605..9cefd30cf 100644 --- a/spa/plugins/vulkan/vulkan-utils.c +++ b/spa/plugins/vulkan/vulkan-utils.c @@ -828,17 +828,6 @@ int vulkan_import_memptr(struct vulkan_base *s, struct external_buffer_info *inf return 0; } -int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction, - struct spa_dict *props) -{ - spa_zero(*stream); - stream->direction = direction; - stream->current_buffer_id = SPA_ID_INVALID; - stream->busy_buffer_id = SPA_ID_INVALID; - stream->ready_buffer_id = SPA_ID_INVALID; - return 0; -} - uint32_t vulkan_vkformat_to_id(VkFormat format) { SPA_FOR_EACH_ELEMENT_VAR(vk_video_format_convs, f) { diff --git a/spa/plugins/vulkan/vulkan-utils.h b/spa/plugins/vulkan/vulkan-utils.h index 991b9f57d..c37c9d1d4 100644 --- a/spa/plugins/vulkan/vulkan-utils.h +++ b/spa/plugins/vulkan/vulkan-utils.h @@ -91,9 +91,6 @@ struct vulkan_modifier_info *vulkan_modifierInfo_find(struct vulkan_base *s, VkF void vulkan_buffer_clear(struct vulkan_base *s, struct vulkan_buffer *buffer); -int vulkan_stream_init(struct vulkan_stream *stream, enum spa_direction direction, - struct spa_dict *props); - uint32_t vulkan_vkformat_to_id(VkFormat vkFormat); VkFormat vulkan_id_to_vkformat(uint32_t id);