Unified · Split
| @@ -30,7 +30,7 @@ ivec4 load_components(ivec2 pos) · 29 unmodified lines | ||
| 30 | 30 | pix[i] = int(imageLoad(src[i], pos)[0]); |
| 31 | 31 | |
| 32 | 32 | /* Swizzle out the difference */ |
| 33 | − if (bits > 8 && bits < 16) | |
| 33 | + if (bits > 8 && bits < 16 && transparency == 0) | |
| 34 | 34 | return pix.bgra; |
| 35 | 35 | return pix.brga; |
| 36 | 36 | } |
| @@ -337,6 +337,9 @@ static const struct FFVkFormatEntry { · 336 unmodified lines | ||
| 337 | 337 | |
| 338 | 338 | /* Planar RGB + Alpha */ |
| 339 | 339 | { 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 } }, | |
| 340 | 343 | { 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 } }, |
| 341 | 344 | { 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 } }, |
| 342 | 345 | |
| @@ -1332,7 +1332,9 @@ int ff_vk_mt_is_np_rgb(enum AVPixelFormat pix_fmt) · 1331 unmodified lines | ||
| 1332 | 1332 | pix_fmt == AV_PIX_FMT_0BGR || pix_fmt == AV_PIX_FMT_RGB0 || |
| 1333 | 1333 | pix_fmt == AV_PIX_FMT_GBRP10 || pix_fmt == AV_PIX_FMT_GBRP12 || |
| 1334 | 1334 | 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 || | |
| 1336 | 1338 | pix_fmt == AV_PIX_FMT_GBRPF32 || pix_fmt == AV_PIX_FMT_GBRAPF32 || |
| 1337 | 1339 | pix_fmt == AV_PIX_FMT_X2RGB10 || pix_fmt == AV_PIX_FMT_X2BGR10 || |
| 1338 | 1340 | 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 | ||
| 1427 | 1429 | case AV_PIX_FMT_GRAY12: |
| 1428 | 1430 | case AV_PIX_FMT_GRAY14: |
| 1429 | 1431 | case AV_PIX_FMT_GRAY16: |
| 1432 | + case AV_PIX_FMT_GBRAP10: | |
| 1433 | + case AV_PIX_FMT_GBRAP12: | |
| 1434 | + case AV_PIX_FMT_GBRAP14: | |
| 1430 | 1435 | case AV_PIX_FMT_GBRAP16: |
| 1431 | 1436 | case AV_PIX_FMT_GBRP10: |
| 1432 | 1437 | case AV_PIX_FMT_GBRP12: |