This allows mapping of 10-bit DRM images.
Unified · Split
| @@ -186,6 +186,7 @@ static const struct FFVkFormatEntry { · 185 unmodified lines | |||
| 186 | { VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGR0, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_B8G8R8A8_UNORM } }, | 186 | { VK_FORMAT_B8G8R8A8_UNORM, AV_PIX_FMT_BGR0, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_B8G8R8A8_UNORM } }, |
| 187 | { VK_FORMAT_R8G8B8A8_UNORM, AV_PIX_FMT_RGB0, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } }, | 187 | { VK_FORMAT_R8G8B8A8_UNORM, AV_PIX_FMT_RGB0, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_R8G8B8A8_UNORM } }, |
| 188 | { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_X2RGB10, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2R10G10B10_UNORM_PACK32 } }, | 188 | { VK_FORMAT_A2R10G10B10_UNORM_PACK32, AV_PIX_FMT_X2RGB10, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2R10G10B10_UNORM_PACK32 } }, |
| 189 | { VK_FORMAT_A2B10G10R10_UNORM_PACK32, AV_PIX_FMT_X2BGR10, VK_IMAGE_ASPECT_COLOR_BIT, 1, 1, 1, { VK_FORMAT_A2B10G10R10_UNORM_PACK32 } }, | ||
| 189 | 190 | ||
| 190 | /* Planar RGB */ | 191 | /* Planar RGB */ |
| 191 | { VK_FORMAT_R8_UNORM, AV_PIX_FMT_GBRAP, VK_IMAGE_ASPECT_COLOR_BIT, 1, 4, 4, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } }, | 192 | { VK_FORMAT_R8_UNORM, AV_PIX_FMT_GBRAP, VK_IMAGE_ASPECT_COLOR_BIT, 1, 4, 4, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } }, |
| @@ -2791,6 +2792,10 @@ static const struct { · 2599 unmodified lines | |||
| 2791 | { DRM_FORMAT_XRGB8888, VK_FORMAT_B8G8R8A8_UNORM }, | 2792 | { DRM_FORMAT_XRGB8888, VK_FORMAT_B8G8R8A8_UNORM }, |
| 2792 | { DRM_FORMAT_ABGR8888, VK_FORMAT_R8G8B8A8_UNORM }, | 2793 | { DRM_FORMAT_ABGR8888, VK_FORMAT_R8G8B8A8_UNORM }, |
| 2793 | { DRM_FORMAT_XBGR8888, VK_FORMAT_R8G8B8A8_UNORM }, | 2794 | { DRM_FORMAT_XBGR8888, VK_FORMAT_R8G8B8A8_UNORM }, |
| 2795 | { DRM_FORMAT_ARGB2101010, VK_FORMAT_A2B10G10R10_UNORM_PACK32 }, | ||
| 2796 | { DRM_FORMAT_ABGR2101010, VK_FORMAT_A2R10G10B10_UNORM_PACK32 }, | ||
| 2797 | { DRM_FORMAT_XRGB2101010, VK_FORMAT_A2B10G10R10_UNORM_PACK32 }, | ||
| 2798 | { DRM_FORMAT_XBGR2101010, VK_FORMAT_A2R10G10B10_UNORM_PACK32 }, | ||
| 2794 | 2799 | ||
| 2795 | // All these DRM_FORMATs were added in the same libdrm commit. | 2800 | // All these DRM_FORMATs were added in the same libdrm commit. |
| 2796 | #ifdef DRM_FORMAT_XYUV8888 | 2801 | #ifdef DRM_FORMAT_XYUV8888 |
| @@ -1162,7 +1162,8 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt) · 1161 unmodified lines | |||
| 1162 | pix_fmt == AV_PIX_FMT_BGR24 || pix_fmt == AV_PIX_FMT_RGB48 || | 1162 | pix_fmt == AV_PIX_FMT_BGR24 || pix_fmt == AV_PIX_FMT_RGB48 || |
| 1163 | pix_fmt == AV_PIX_FMT_RGBA64 || pix_fmt == AV_PIX_FMT_RGB565 || | 1163 | pix_fmt == AV_PIX_FMT_RGBA64 || pix_fmt == AV_PIX_FMT_RGB565 || |
| 1164 | pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_BGR0 || | 1164 | pix_fmt == AV_PIX_FMT_BGR565 || pix_fmt == AV_PIX_FMT_BGR0 || |
| 1165 | pix_fmt == AV_PIX_FMT_0BGR || pix_fmt == AV_PIX_FMT_RGB0) | 1165 | pix_fmt == AV_PIX_FMT_0BGR || pix_fmt == AV_PIX_FMT_RGB0 || |
| 1166 | pix_fmt == AV_PIX_FMT_X2RGB10 || pix_fmt == AV_PIX_FMT_X2BGR10) | ||
| 1166 | return 1; | 1167 | return 1; |
| 1167 | return 0; | 1168 | return 0; |
| 1168 | } | 1169 | } |