* [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image
@ 2025-02-28 7:49 IndecisiveTurtle
2025-02-28 12:45 ` Lynne
2025-02-28 13:38 ` Andreas Rheinhardt
0 siblings, 2 replies; 4+ messages in thread
From: IndecisiveTurtle @ 2025-02-28 7:49 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: IndecisiveTurtle
Useful when creating a descriptor array of separate images
---
libavutil/vulkan.c | 12 ++++++------
libavutil/vulkan.h | 8 ++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 31610e2d94..91415957fd 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -2381,10 +2381,10 @@ static inline void update_set_pool_write(FFVulkanContext *s, FFVkExecContext *e,
}
}
-static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
- FFVkExecContext *e, int set, int bind, int offs,
- VkImageView view, VkImageLayout layout,
- VkSampler sampler)
+int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
+ FFVkExecContext *e, int set, int bind, int offs,
+ VkImageView view, VkImageLayout layout,
+ VkSampler sampler)
{
FFVulkanDescriptorSet *desc_set = &shd->desc_set[set];
@@ -2521,8 +2521,8 @@ void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e,
const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
for (int i = 0; i < nb_planes; i++)
- vk_set_descriptor_image(s, shd, e, set, binding, i,
- views[i], layout, sampler);
+ 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,
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 8690c13b3d..eb80c84d26 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -580,6 +580,14 @@ void ff_vk_shader_update_push_const(FFVulkanContext *s, FFVkExecContext *e,
VkShaderStageFlagBits stage,
int offset, size_t size, void *src);
+/**
+ * Sets an image descriptor for specified shader and binding.
+ */
+int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
+ FFVkExecContext *e, int set, int bind, int offs,
+ VkImageView view, VkImageLayout layout,
+ VkSampler sampler);
+
/**
* Update a descriptor in a buffer with a buffer.
* Must be called before binding the shader.
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image
2025-02-28 7:49 [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image IndecisiveTurtle
@ 2025-02-28 12:45 ` Lynne
2025-02-28 13:38 ` Andreas Rheinhardt
1 sibling, 0 replies; 4+ messages in thread
From: Lynne @ 2025-02-28 12:45 UTC (permalink / raw)
To: ffmpeg-devel
[-- Attachment #1.1.1.1: Type: text/plain, Size: 2702 bytes --]
On 28/02/2025 08:49, IndecisiveTurtle wrote:
> Useful when creating a descriptor array of separate images
> ---
> libavutil/vulkan.c | 12 ++++++------
> libavutil/vulkan.h | 8 ++++++++
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
> index 31610e2d94..91415957fd 100644
> --- a/libavutil/vulkan.c
> +++ b/libavutil/vulkan.c
> @@ -2381,10 +2381,10 @@ static inline void update_set_pool_write(FFVulkanContext *s, FFVkExecContext *e,
> }
> }
>
> -static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
> - FFVkExecContext *e, int set, int bind, int offs,
> - VkImageView view, VkImageLayout layout,
> - VkSampler sampler)
> +int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
> + FFVkExecContext *e, int set, int bind, int offs,
> + VkImageView view, VkImageLayout layout,
> + VkSampler sampler)
> {
> FFVulkanDescriptorSet *desc_set = &shd->desc_set[set];
>
> @@ -2521,8 +2521,8 @@ void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e,
> const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
>
> for (int i = 0; i < nb_planes; i++)
> - vk_set_descriptor_image(s, shd, e, set, binding, i,
> - views[i], layout, sampler);
> + 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,
> diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
> index 8690c13b3d..eb80c84d26 100644
> --- a/libavutil/vulkan.h
> +++ b/libavutil/vulkan.h
> @@ -580,6 +580,14 @@ void ff_vk_shader_update_push_const(FFVulkanContext *s, FFVkExecContext *e,
> VkShaderStageFlagBits stage,
> int offset, size_t size, void *src);
>
> +/**
> + * Sets an image descriptor for specified shader and binding.
> + */
> +int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
> + FFVkExecContext *e, int set, int bind, int offs,
> + VkImageView view, VkImageLayout layout,
> + VkSampler sampler);
> +
> /**
> * Update a descriptor in a buffer with a buffer.
> * Must be called before binding the shader.
Thanks, pushed
[-- Attachment #1.1.1.2: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 637 bytes --]
[-- Attachment #1.2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
[-- Attachment #2: Type: text/plain, Size: 251 bytes --]
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image
2025-02-28 7:49 [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image IndecisiveTurtle
2025-02-28 12:45 ` Lynne
@ 2025-02-28 13:38 ` Andreas Rheinhardt
1 sibling, 0 replies; 4+ messages in thread
From: Andreas Rheinhardt @ 2025-02-28 13:38 UTC (permalink / raw)
To: ffmpeg-devel
IndecisiveTurtle:
> Useful when creating a descriptor array of separate images
> ---
> libavutil/vulkan.c | 12 ++++++------
> libavutil/vulkan.h | 8 ++++++++
> 2 files changed, 14 insertions(+), 6 deletions(-)
>
> diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
> index 31610e2d94..91415957fd 100644
> --- a/libavutil/vulkan.c
> +++ b/libavutil/vulkan.c
> @@ -2381,10 +2381,10 @@ static inline void update_set_pool_write(FFVulkanContext *s, FFVkExecContext *e,
> }
> }
>
> -static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
> - FFVkExecContext *e, int set, int bind, int offs,
> - VkImageView view, VkImageLayout layout,
> - VkSampler sampler)
> +int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
> + FFVkExecContext *e, int set, int bind, int offs,
> + VkImageView view, VkImageLayout layout,
> + VkSampler sampler)
> {
> FFVulkanDescriptorSet *desc_set = &shd->desc_set[set];
>
> @@ -2521,8 +2521,8 @@ void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e,
> const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
>
> for (int i = 0; i < nb_planes; i++)
> - vk_set_descriptor_image(s, shd, e, set, binding, i,
> - views[i], layout, sampler);
> + 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,
> diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
> index 8690c13b3d..eb80c84d26 100644
> --- a/libavutil/vulkan.h
> +++ b/libavutil/vulkan.h
> @@ -580,6 +580,14 @@ void ff_vk_shader_update_push_const(FFVulkanContext *s, FFVkExecContext *e,
> VkShaderStageFlagBits stage,
> int offset, size_t size, void *src);
>
> +/**
> + * Sets an image descriptor for specified shader and binding.
> + */
> +int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
> + FFVkExecContext *e, int set, int bind, int offs,
> + VkImageView view, VkImageLayout layout,
> + VkSampler sampler);
> +
> /**
> * Update a descriptor in a buffer with a buffer.
> * Must be called before binding the shader.
This should have been in the same patchset that uses it.
- Andreas
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
* [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image
@ 2025-02-28 7:45 IndecisiveTurtle
0 siblings, 0 replies; 4+ messages in thread
From: IndecisiveTurtle @ 2025-02-28 7:45 UTC (permalink / raw)
To: ffmpeg-devel; +Cc: IndecisiveTurtle
From: IndecisiveTurtle <47210458+raphaelthegreat@users.noreply.github.com>
Useful when creating a descriptor array of separate images
---
libavutil/vulkan.c | 12 ++++++------
libavutil/vulkan.h | 8 ++++++++
2 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/libavutil/vulkan.c b/libavutil/vulkan.c
index 31610e2d94..91415957fd 100644
--- a/libavutil/vulkan.c
+++ b/libavutil/vulkan.c
@@ -2381,10 +2381,10 @@ static inline void update_set_pool_write(FFVulkanContext *s, FFVkExecContext *e,
}
}
-static int vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
- FFVkExecContext *e, int set, int bind, int offs,
- VkImageView view, VkImageLayout layout,
- VkSampler sampler)
+int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
+ FFVkExecContext *e, int set, int bind, int offs,
+ VkImageView view, VkImageLayout layout,
+ VkSampler sampler)
{
FFVulkanDescriptorSet *desc_set = &shd->desc_set[set];
@@ -2521,8 +2521,8 @@ void ff_vk_shader_update_img_array(FFVulkanContext *s, FFVkExecContext *e,
const int nb_planes = av_pix_fmt_count_planes(hwfc->sw_format);
for (int i = 0; i < nb_planes; i++)
- vk_set_descriptor_image(s, shd, e, set, binding, i,
- views[i], layout, sampler);
+ 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,
diff --git a/libavutil/vulkan.h b/libavutil/vulkan.h
index 8690c13b3d..04068713be 100644
--- a/libavutil/vulkan.h
+++ b/libavutil/vulkan.h
@@ -580,6 +580,14 @@ void ff_vk_shader_update_push_const(FFVulkanContext *s, FFVkExecContext *e,
VkShaderStageFlagBits stage,
int offset, size_t size, void *src);
+/**
+ * Sets an image descriptor for specified shader and binding.
+ */
+int ff_vk_set_descriptor_image(FFVulkanContext *s, FFVulkanShader *shd,
+ FFVkExecContext *e, int set, int bind, int offs,
+ VkImageView view, VkImageLayout layout,
+ VkSampler sampler);
+
/**
* Update a descriptor in a buffer with a buffer.
* Must be called before binding the shader.
--
2.48.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2025-02-28 13:38 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-02-28 7:49 [FFmpeg-devel] [PATCH] libavutil/vulkan: Expose ff_vk_set_descriptor_image IndecisiveTurtle
2025-02-28 12:45 ` Lynne
2025-02-28 13:38 ` Andreas Rheinhardt
-- strict thread matches above, loose matches on Subject: below --
2025-02-28 7:45 IndecisiveTurtle
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git