eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-01-03 21:00:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

vulkan: move shader data execution state to execution pools

Browse Source 
This finally permits using fully compiled shaders across
multiple execution contexts.
This commit is contained in:
Lynne
2024-09-29 06:37:10 +02:00
parent 0a37d5a3b1
commit d233d9902f
2 changed files with 153 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
libavutil/vulkan.h
View File

@@ -162,31 +162,11 @@ typedef struct FFVkExecContext {
unsigned int frame_update_alloc_size;
} FFVkExecContext;
typedef struct FFVkExecPool {
FFVkExecContext *contexts;
atomic_int_least64_t idx;
VkCommandPool cmd_buf_pool;
VkCommandBuffer *cmd_bufs;
int pool_size;
VkQueryPool query_pool;
void *query_data;
int query_results;
int query_statuses;
int query_64bit;
int query_status_stride;
int nb_queries;
size_t qd_size;
} FFVkExecPool;
typedef struct FFVulkanDescriptorSet {
FFVkBuffer buf;
uint8_t *desc_mem;
VkDeviceSize layout_size;
VkDeviceSize aligned_size; /* descriptorBufferOffsetAlignment */
VkDeviceSize total_size; /* Once registered to an exec context */
VkBufferUsageFlags usage;
/* Descriptor buffer */
VkDeviceSize layout_size;
VkDeviceSize aligned_size; /* descriptorBufferOffsetAlignment */
VkBufferUsageFlags usage;
VkDescriptorSetLayoutBinding *binding;
VkDeviceSize *binding_offset;
@@ -225,23 +205,62 @@ typedef struct FFVulkanShader {
VkPushConstantRange *push_consts;
int push_consts_num;
/* Descriptor sets */
FFVulkanDescriptorSet *desc_set;
int nb_descriptor_sets;
/* Descriptor buffer */
VkDescriptorSetLayout *desc_layout;
FFVulkanDescriptorSet *desc_set;
VkDescriptorBufferBindingInfoEXT *desc_bind;
uint32_t *bound_buffer_indices;
int nb_descriptor_sets;
/* Descriptor pool */
int use_push;
VkDescriptorSet *desc_sets;
VkDescriptorPool desc_pool;
VkDescriptorPoolSize *desc_pool_size;
int nb_desc_pool_size;
int total_desc_sets;
FFVkExecPool *assoc_pool;
} FFVulkanShader;
typedef struct FFVulkanDescriptorSetData {
/* Descriptor buffer */
FFVkBuffer buf;
uint8_t *desc_mem;
} FFVulkanDescriptorSetData;
typedef struct FFVulkanShaderData {
/* Shader to which this data belongs to */
FFVulkanShader *shd;
int nb_descriptor_sets;
/* Descriptor buffer */
FFVulkanDescriptorSetData *desc_set_buf;
VkDescriptorBufferBindingInfoEXT *desc_bind;
/* Descriptor pools */
VkDescriptorSet *desc_sets;
VkDescriptorPool desc_pool;
} FFVulkanShaderData;
typedef struct FFVkExecPool {
FFVkExecContext *contexts;
atomic_int_least64_t idx;
VkCommandPool cmd_buf_pool;
VkCommandBuffer *cmd_bufs;
int pool_size;
VkQueryPool query_pool;
void *query_data;
int query_results;
int query_statuses;
int query_64bit;
int query_status_stride;
int nb_queries;
size_t qd_size;
/* Registered shaders' data */
FFVulkanShaderData *reg_shd;
int nb_reg_shd;
} FFVkExecPool;
typedef struct FFVulkanContext {
const AVClass *class;
void *log_parent;