vulkan: rename ff_vk_set_descriptor_image to ff_vk_shader_update_img

Lynne committed 1 year ago

Commit 7046e651 parent 49af9742 files · +21 −21Browse files

Unified · Split

2 files

libavutil/vulkan.c +17 −17
libavutil/vulkan.h +4 −4

     }
 }
-int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
+int ff_vk_shader_update_img(FFVulkanContext *s, FFVkExecContext *e,
-                               FFVkExecContext *e, int set, int bind, int offs,
+                            FFVulkanShader *shd, int set, int bind, int offs,
-                               VkImageView view, VkImageLayout layout,
+                            VkImageView view, VkImageLayout layout,
-                               VkSampler sampler)
+                            VkSampler sampler)
 {
     FFVulkanDescriptorSet *desc_set = &shd->desc_set[set];
     return 0;
 }
+void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e,
+                                   FFVulkanShader *shd, AVFrame *f,
+                                   VkImageView *views, int set, int binding,
+                                   VkImageLayout layout, VkSampler sampler)
+{
+    AVHWFramesContext *hwfc = (AVHWFramesContext *)f->hw_frames_ctx->data;
+    const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
+    for (int i = 0; i < nb_planes; i++)
+        ff_vk_shader_update_img(s, e, shd, set, binding, i,
+                                views[i], layout, sampler);
+}
 int ff_vk_shader_update_desc_buffer(FFVulkanContext *s, FFVkExecContext *e,
                                     FFVulkanShader *shd,
                                     int set, int bind, int elem,
     return 0;
 }
-void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e,
-                                   FFVulkanShader *shd, AVFrame *f,
-                                   VkImageView *views, int set, int binding,
-                                   VkImageLayout layout, VkSampler sampler)
-{
-    AVHWFramesContext *hwfc = (AVHWFramesContext *)f->hw_frames_ctx->data;
-    const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
-    for (int i = 0; i < nb_planes; i++)
-        ff_vk_set_descriptor_image(s, shd, e, set, binding, i,
-                                   views[i], layout, sampler);
-}
 void ff_vk_shader_update_push_const(FFVulkanContext *s, FFVkExecContext *e,
                                     FFVulkanShader *shd,
                                     VkShaderStageFlagBits stage,

libavutil/vulkan.h+4−4

@@ -590,10 +590,10 @@ int ff_vk_shader_update_desc_buffer(FFVulkanContext s, FFVkExecContext e, · 589 unmodified lines
590	/**	590	/**
591	* Sets an image descriptor for specified shader and binding.	591	* Sets an image descriptor for specified shader and binding.
592	*/	592	*/
593	int ff_vk_set_descriptor_image(FFVulkanContext s, FFVulkanShader shd,	593	int ff_vk_shader_update_img(FFVulkanContext s, FFVkExecContext e,
594	FFVkExecContext *e, int set, int bind, int offs,	594	FFVulkanShader *shd, int set, int bind, int offs,
595	VkImageView view, VkImageLayout layout,	595	VkImageView view, VkImageLayout layout,
596	VkSampler sampler);	596	VkSampler sampler);
597		597
598	/**	598	/**
599	* Update a descriptor in a buffer with an image array..	599	* Update a descriptor in a buffer with an image array..

vulkan: rename ff_vk_set_descriptor_image to ff_vk_shader_update_img

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code