mirror of
https://git.h3cjp.net/H3cJP/citra.git
synced 2024-11-27 14:33:00 +00:00
Merge pull request #9307 from Morph1984/not-used-correctly
maxwell_to_vk: Fix format usage bits and add R16_SINT
This commit is contained in:
commit
ddca512f3f
|
@ -150,7 +150,7 @@ struct FormatTuple {
|
||||||
{VK_FORMAT_BC6H_UFLOAT_BLOCK}, // BC6H_UFLOAT
|
{VK_FORMAT_BC6H_UFLOAT_BLOCK}, // BC6H_UFLOAT
|
||||||
{VK_FORMAT_BC6H_SFLOAT_BLOCK}, // BC6H_SFLOAT
|
{VK_FORMAT_BC6H_SFLOAT_BLOCK}, // BC6H_SFLOAT
|
||||||
{VK_FORMAT_ASTC_4x4_UNORM_BLOCK}, // ASTC_2D_4X4_UNORM
|
{VK_FORMAT_ASTC_4x4_UNORM_BLOCK}, // ASTC_2D_4X4_UNORM
|
||||||
{VK_FORMAT_B8G8R8A8_UNORM, Attachable}, // B8G8R8A8_UNORM
|
{VK_FORMAT_B8G8R8A8_UNORM, Attachable | Storage}, // B8G8R8A8_UNORM
|
||||||
{VK_FORMAT_R32G32B32A32_SFLOAT, Attachable | Storage}, // R32G32B32A32_FLOAT
|
{VK_FORMAT_R32G32B32A32_SFLOAT, Attachable | Storage}, // R32G32B32A32_FLOAT
|
||||||
{VK_FORMAT_R32G32B32A32_SINT, Attachable | Storage}, // R32G32B32A32_SINT
|
{VK_FORMAT_R32G32B32A32_SINT, Attachable | Storage}, // R32G32B32A32_SINT
|
||||||
{VK_FORMAT_R32G32_SFLOAT, Attachable | Storage}, // R32G32_FLOAT
|
{VK_FORMAT_R32G32_SFLOAT, Attachable | Storage}, // R32G32_FLOAT
|
||||||
|
@ -160,7 +160,7 @@ struct FormatTuple {
|
||||||
{VK_FORMAT_R16_UNORM, Attachable | Storage}, // R16_UNORM
|
{VK_FORMAT_R16_UNORM, Attachable | Storage}, // R16_UNORM
|
||||||
{VK_FORMAT_R16_SNORM, Attachable | Storage}, // R16_SNORM
|
{VK_FORMAT_R16_SNORM, Attachable | Storage}, // R16_SNORM
|
||||||
{VK_FORMAT_R16_UINT, Attachable | Storage}, // R16_UINT
|
{VK_FORMAT_R16_UINT, Attachable | Storage}, // R16_UINT
|
||||||
{VK_FORMAT_UNDEFINED}, // R16_SINT
|
{VK_FORMAT_R16_SINT, Attachable | Storage}, // R16_SINT
|
||||||
{VK_FORMAT_R16G16_UNORM, Attachable | Storage}, // R16G16_UNORM
|
{VK_FORMAT_R16G16_UNORM, Attachable | Storage}, // R16G16_UNORM
|
||||||
{VK_FORMAT_R16G16_SFLOAT, Attachable | Storage}, // R16G16_FLOAT
|
{VK_FORMAT_R16G16_SFLOAT, Attachable | Storage}, // R16G16_FLOAT
|
||||||
{VK_FORMAT_R16G16_UINT, Attachable | Storage}, // R16G16_UINT
|
{VK_FORMAT_R16G16_UINT, Attachable | Storage}, // R16G16_UINT
|
||||||
|
@ -184,7 +184,7 @@ struct FormatTuple {
|
||||||
{VK_FORMAT_BC2_SRGB_BLOCK}, // BC2_SRGB
|
{VK_FORMAT_BC2_SRGB_BLOCK}, // BC2_SRGB
|
||||||
{VK_FORMAT_BC3_SRGB_BLOCK}, // BC3_SRGB
|
{VK_FORMAT_BC3_SRGB_BLOCK}, // BC3_SRGB
|
||||||
{VK_FORMAT_BC7_SRGB_BLOCK}, // BC7_SRGB
|
{VK_FORMAT_BC7_SRGB_BLOCK}, // BC7_SRGB
|
||||||
{VK_FORMAT_R4G4B4A4_UNORM_PACK16, Attachable}, // A4B4G4R4_UNORM
|
{VK_FORMAT_R4G4B4A4_UNORM_PACK16}, // A4B4G4R4_UNORM
|
||||||
{VK_FORMAT_R4G4_UNORM_PACK8}, // G4R4_UNORM
|
{VK_FORMAT_R4G4_UNORM_PACK8}, // G4R4_UNORM
|
||||||
{VK_FORMAT_ASTC_4x4_SRGB_BLOCK}, // ASTC_2D_4X4_SRGB
|
{VK_FORMAT_ASTC_4x4_SRGB_BLOCK}, // ASTC_2D_4X4_SRGB
|
||||||
{VK_FORMAT_ASTC_8x8_SRGB_BLOCK}, // ASTC_2D_8X8_SRGB
|
{VK_FORMAT_ASTC_8x8_SRGB_BLOCK}, // ASTC_2D_8X8_SRGB
|
||||||
|
|
Loading…
Reference in a new issue