History

hwcontext_vulkan: add support for AV_PIX_FMT_GBRAP10/12/14

Lynne committed 1 year ago

Commit f65e5121 parent 7c52dda3 files · +10 −2Browse files

Unified · Split

3 files
  1. libavcodec/vulkan/ffv1_enc_rct.comp +1 −1
  2. libavutil/hwcontext_vulkan.c +3 −0
  3. libavutil/vulkan.c +6 −1
libavcodec/vulkan/ffv1_enc_rct.comp+1−1
@@ -30,7 +30,7 @@ ivec4 load_components(ivec2 pos) · 29 unmodified lines
3030 pix[i] = int(imageLoad(src[i], pos)[0]);
3131
3232 /* Swizzle out the difference */
33− if (bits > 8 && bits < 16)
33+ if (bits > 8 && bits < 16 && transparency == 0)
3434 return pix.bgra;
3535 return pix.brga;
3636 }
libavutil/hwcontext_vulkan.c+3−0
@@ -337,6 +337,9 @@ static const struct FFVkFormatEntry { · 336 unmodified lines
337337
338338 /* Planar RGB + Alpha */
339339 { VK_FORMAT_R8_UNORM, AV_PIX_FMT_GBRAP, VK_IMAGE_ASPECT_COLOR_BIT, 4, 4, 4, { VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM, VK_FORMAT_R8_UNORM } },
340+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRAP10, VK_IMAGE_ASPECT_COLOR_BIT, 4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
341+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRAP12, VK_IMAGE_ASPECT_COLOR_BIT, 4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
342+ { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRAP14, VK_IMAGE_ASPECT_COLOR_BIT, 4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
340343 { VK_FORMAT_R16_UNORM, AV_PIX_FMT_GBRAP16, VK_IMAGE_ASPECT_COLOR_BIT, 4, 4, 4, { VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM, VK_FORMAT_R16_UNORM } },
341344 { VK_FORMAT_R32_SFLOAT, AV_PIX_FMT_GBRAPF32, VK_IMAGE_ASPECT_COLOR_BIT, 4, 4, 4, { VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT, VK_FORMAT_R32_SFLOAT } },
342345
libavutil/vulkan.c+6−1
@@ -1332,7 +1332,9 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt) · 1331 unmodified lines
13321332 pix_fmt == AV_PIX_FMT_0BGR || pix_fmt == AV_PIX_FMT_RGB0 ||
13331333 pix_fmt == AV_PIX_FMT_GBRP10 || pix_fmt == AV_PIX_FMT_GBRP12 ||
13341334 pix_fmt == AV_PIX_FMT_GBRP14 || pix_fmt == AV_PIX_FMT_GBRP16 ||
1335− pix_fmt == AV_PIX_FMT_GBRAP || pix_fmt == AV_PIX_FMT_GBRAP16 ||
1335+ pix_fmt == AV_PIX_FMT_GBRAP || pix_fmt == AV_PIX_FMT_GBRAP10 ||
1336+ pix_fmt == AV_PIX_FMT_GBRAP12 || pix_fmt == AV_PIX_FMT_GBRAP14 ||
1337+ pix_fmt == AV_PIX_FMT_GBRAP16 ||
13361338 pix_fmt == AV_PIX_FMT_GBRPF32 || pix_fmt == AV_PIX_FMT_GBRAPF32 ||
13371339 pix_fmt == AV_PIX_FMT_X2RGB10 || pix_fmt == AV_PIX_FMT_X2BGR10 ||
13381340 pix_fmt == AV_PIX_FMT_RGBAF32 || pix_fmt == AV_PIX_FMT_RGBF32 ||
@@ -1427,6 +1429,9 @@ const char *ff_vk_shader_rep_fmt(enum AVPixelFormat pix_fmt, · 88 unmodified lines
14271429 case AV_PIX_FMT_GRAY12:
14281430 case AV_PIX_FMT_GRAY14:
14291431 case AV_PIX_FMT_GRAY16:
1432+ case AV_PIX_FMT_GBRAP10:
1433+ case AV_PIX_FMT_GBRAP12:
1434+ case AV_PIX_FMT_GBRAP14:
14301435 case AV_PIX_FMT_GBRAP16:
14311436 case AV_PIX_FMT_GBRP10:
14321437 case AV_PIX_FMT_GBRP12:

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t