diff --git a/src/Magnum/Vk/Format.h b/src/Magnum/Vk/Format.h index b49290853..ca2734e7e 100644 --- a/src/Magnum/Vk/Format.h +++ b/src/Magnum/Vk/Format.h @@ -76,114 +76,114 @@ enum class Format: UnsignedInt { BGR8_UInt = VK_FORMAT_B8G8R8_UINT, BGR8_SInt = VK_FORMAT_B8G8R8_SINT, BGR8_SRGB = VK_FORMAT_B8G8R8_SRGB, - RBA8_UNorm = VK_FORMAT_R8G8B8A8_UNORM, + RGBA8_UNorm = VK_FORMAT_R8G8B8A8_UNORM, RGBA8_SNorm = VK_FORMAT_R8G8B8A8_SNORM, RGBA8_UScaled = VK_FORMAT_R8G8B8A8_USCALED, RGBA8_SScaled = VK_FORMAT_R8G8B8A8_SSCALED, - RGBA8_UINT = VK_FORMAT_R8G8B8A8_UINT, - RGBA8_SINT = VK_FORMAT_R8G8B8A8_SINT, + RGBA8_UInt = VK_FORMAT_R8G8B8A8_UINT, + RGBA8_SInt = VK_FORMAT_R8G8B8A8_SINT, RGBA8_SRGB = VK_FORMAT_R8G8B8A8_SRGB, BGRA8_UNorm = VK_FORMAT_B8G8R8A8_UNORM, BGRA8_SNorm = VK_FORMAT_B8G8R8A8_SNORM, - BGRA8_USCALED = VK_FORMAT_B8G8R8A8_USCALED, - BGRA8_SSCALED = VK_FORMAT_B8G8R8A8_SSCALED, - BGRA8_UINT = VK_FORMAT_B8G8R8A8_UINT, - BGRA8_SINT = VK_FORMAT_B8G8R8A8_SINT, + BGRA8_UScaled = VK_FORMAT_B8G8R8A8_USCALED, + BGRA8_SScaled = VK_FORMAT_B8G8R8A8_SSCALED, + BGRA8_UInt = VK_FORMAT_B8G8R8A8_UINT, + BGRA8_SInt = VK_FORMAT_B8G8R8A8_SINT, BGRA8_SRGB = VK_FORMAT_B8G8R8A8_SRGB, ABGR8_UNorm_Pack32 = VK_FORMAT_A8B8G8R8_UNORM_PACK32, ABGR8_SNorm_Pack32 = VK_FORMAT_A8B8G8R8_SNORM_PACK32, - ABGR8_USCALED_Pack32 = VK_FORMAT_A8B8G8R8_USCALED_PACK32, - ABGR8_SSCALED_Pack32 = VK_FORMAT_A8B8G8R8_SSCALED_PACK32, - ABGR8_UINT_Pack32 = VK_FORMAT_A8B8G8R8_UINT_PACK32, - ABGR8_SINT_Pack32 = VK_FORMAT_A8B8G8R8_SINT_PACK32, + ABGR8_UScaled_Pack32 = VK_FORMAT_A8B8G8R8_USCALED_PACK32, + ABGR8_SScaled_Pack32 = VK_FORMAT_A8B8G8R8_SSCALED_PACK32, + ABGR8_UInt_Pack32 = VK_FORMAT_A8B8G8R8_UINT_PACK32, + ABGR8_SInt_Pack32 = VK_FORMAT_A8B8G8R8_SINT_PACK32, ABGR8_SRGB_Pack32 = VK_FORMAT_A8B8G8R8_SRGB_PACK32, A2RGB10_UNorm_Pack32 = VK_FORMAT_A2R10G10B10_UNORM_PACK32, A2RGB10_SNorm_Pack32 = VK_FORMAT_A2R10G10B10_SNORM_PACK32, - A2RGB10_USCALED_Pack32 = VK_FORMAT_A2R10G10B10_USCALED_PACK32, - A2RGB10_SSCALED_Pack32 = VK_FORMAT_A2R10G10B10_SSCALED_PACK32, - A2RGB10_UINT_Pack32 = VK_FORMAT_A2R10G10B10_UINT_PACK32, - A2RGB10_SINT_Pack32 = VK_FORMAT_A2R10G10B10_SINT_PACK32, + A2RGB10_UScaled_Pack32 = VK_FORMAT_A2R10G10B10_USCALED_PACK32, + A2RGB10_SScaled_Pack32 = VK_FORMAT_A2R10G10B10_SSCALED_PACK32, + A2RGB10_UInt_Pack32 = VK_FORMAT_A2R10G10B10_UINT_PACK32, + A2RGB10_SInt_Pack32 = VK_FORMAT_A2R10G10B10_SINT_PACK32, A2BGR10_UNorm_Pack32 = VK_FORMAT_A2B10G10R10_UNORM_PACK32, A2BGR10_SNorm_Pack32 = VK_FORMAT_A2B10G10R10_SNORM_PACK32, - A2BGR10_USCALED_PACK32 = VK_FORMAT_A2B10G10R10_USCALED_PACK32, - A2BGR10_SSCALED_PACK32 = VK_FORMAT_A2B10G10R10_SSCALED_PACK32, - A2BGR10_UINT_PACK32 = VK_FORMAT_A2B10G10R10_UINT_PACK32, - A2BGR10_SINT_PACK32 = VK_FORMAT_A2B10G10R10_SINT_PACK32, + A2BGR10_UScaled_Pack32 = VK_FORMAT_A2B10G10R10_USCALED_PACK32, + A2BGR10_SScaled_Pack32 = VK_FORMAT_A2B10G10R10_SSCALED_PACK32, + A2BGR10_UInt_Pack32 = VK_FORMAT_A2B10G10R10_UINT_PACK32, + A2BGR10_SInt_Pack32 = VK_FORMAT_A2B10G10R10_SINT_PACK32, R16_UNorm = VK_FORMAT_R16_UNORM, R16_SNorm = VK_FORMAT_R16_SNORM, - R16_USCALED = VK_FORMAT_R16_USCALED, - R16_SSCALED = VK_FORMAT_R16_SSCALED, - R16_UINT = VK_FORMAT_R16_UINT, - R16_SINT = VK_FORMAT_R16_SINT, - R16_SFLOAT = VK_FORMAT_R16_SFLOAT, + R16_UScaled = VK_FORMAT_R16_USCALED, + R16_SScaled = VK_FORMAT_R16_SSCALED, + R16_UInt = VK_FORMAT_R16_UINT, + R16_SInt = VK_FORMAT_R16_SINT, + R16_SFloat = VK_FORMAT_R16_SFLOAT, RG16_UNorm = VK_FORMAT_R16G16_UNORM, RG16_SNorm = VK_FORMAT_R16G16_SNORM, - RG16_USCALED = VK_FORMAT_R16G16_USCALED, - RG16_SSCALED = VK_FORMAT_R16G16_SSCALED, - RG16_UINT = VK_FORMAT_R16G16_UINT, - RG16_SINT = VK_FORMAT_R16G16_SINT, - RG16_SFLOAT = VK_FORMAT_R16G16_SFLOAT, + RG16_UScaled = VK_FORMAT_R16G16_USCALED, + RG16_SScaled = VK_FORMAT_R16G16_SSCALED, + RG16_UInt = VK_FORMAT_R16G16_UINT, + RG16_SInt = VK_FORMAT_R16G16_SINT, + RG16_SFloat = VK_FORMAT_R16G16_SFLOAT, RGB16_UNorm = VK_FORMAT_R16G16B16_UNORM, RGB16_SNorm = VK_FORMAT_R16G16B16_SNORM, - RGB16_USCALED = VK_FORMAT_R16G16B16_USCALED, - RGB16_SSCALED = VK_FORMAT_R16G16B16_SSCALED, - RGB16_UINT = VK_FORMAT_R16G16B16_UINT, - RGB16_SINT = VK_FORMAT_R16G16B16_SINT, - RGB16_SFLOAT = VK_FORMAT_R16G16B16_SFLOAT, + RGB16_UScaled = VK_FORMAT_R16G16B16_USCALED, + RGB16_SScaled = VK_FORMAT_R16G16B16_SSCALED, + RGB16_UInt = VK_FORMAT_R16G16B16_UINT, + RGB16_SInt = VK_FORMAT_R16G16B16_SINT, + RGB16_SFloat = VK_FORMAT_R16G16B16_SFLOAT, RGBA16_UNorm = VK_FORMAT_R16G16B16A16_UNORM, RGBA16_SNorm = VK_FORMAT_R16G16B16A16_SNORM, - RGBA16_USCALED = VK_FORMAT_R16G16B16A16_USCALED, - RGBA16_SSCALED = VK_FORMAT_R16G16B16A16_SSCALED, - RGBA16_UINT = VK_FORMAT_R16G16B16A16_UINT, - RGBA16_SINT = VK_FORMAT_R16G16B16A16_SINT, - RGBA16_SFLOAT = VK_FORMAT_R16G16B16A16_SFLOAT, - R32_UINT = VK_FORMAT_R32_UINT, - R32_SINT = VK_FORMAT_R32_SINT, - R32_SFLOAT = VK_FORMAT_R32_SFLOAT, - RG32_UINT = VK_FORMAT_R32G32_UINT, - RG32_SINT = VK_FORMAT_R32G32_SINT, - RG32_SFLOAT = VK_FORMAT_R32G32_SFLOAT, - RGB32_UINT = VK_FORMAT_R32G32B32_UINT, - RGB32_SINT = VK_FORMAT_R32G32B32_SINT, - RGB32_SFLOAT = VK_FORMAT_R32G32B32_SFLOAT, - RGBA32_UINT = VK_FORMAT_R32G32B32A32_UINT, - RGBA32_SINT = VK_FORMAT_R32G32B32A32_SINT, - RGBA32_SFLOAT = VK_FORMAT_R32G32B32A32_SFLOAT, - R64_UINT = VK_FORMAT_R64_UINT, - R64_SINT = VK_FORMAT_R64_SINT, - R64_SFLOAT = VK_FORMAT_R64_SFLOAT, - RG64_UINT = VK_FORMAT_R64G64_UINT, - RG64_SINT = VK_FORMAT_R64G64_SINT, - RG64_SFLOAT = VK_FORMAT_R64G64_SFLOAT, - RGB64_UINT = VK_FORMAT_R64G64B64_UINT, - RGB64_SINT = VK_FORMAT_R64G64B64_SINT, - RGB64_SFLOAT = VK_FORMAT_R64G64B64_SFLOAT, - RGBA64_UINT = VK_FORMAT_R64G64B64A64_UINT, - RGBA64_SINT = VK_FORMAT_R64G64B64A64_SINT, - RGBA64_SFLOAT = VK_FORMAT_R64G64B64A64_SFLOAT, - B10GR11_UFLOAT_Pack32 = VK_FORMAT_B10G11R11_UFLOAT_PACK32, - E5BGR9_UFLOAT_Pack32 = VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, + RGBA16_UScaled = VK_FORMAT_R16G16B16A16_USCALED, + RGBA16_SScaled = VK_FORMAT_R16G16B16A16_SSCALED, + RGBA16_UInt = VK_FORMAT_R16G16B16A16_UINT, + RGBA16_SInt = VK_FORMAT_R16G16B16A16_SINT, + RGBA16_SFloat = VK_FORMAT_R16G16B16A16_SFLOAT, + R32_UInt = VK_FORMAT_R32_UINT, + R32_SInt = VK_FORMAT_R32_SINT, + R32_SFloat = VK_FORMAT_R32_SFLOAT, + RG32_UInt = VK_FORMAT_R32G32_UINT, + RG32_SInt = VK_FORMAT_R32G32_SINT, + RG32_SFloat = VK_FORMAT_R32G32_SFLOAT, + RGB32_UInt = VK_FORMAT_R32G32B32_UINT, + RGB32_SInt = VK_FORMAT_R32G32B32_SINT, + RGB32_SFloat = VK_FORMAT_R32G32B32_SFLOAT, + RGBA32_UInt = VK_FORMAT_R32G32B32A32_UINT, + RGBA32_SInt = VK_FORMAT_R32G32B32A32_SINT, + RGBA32_SFloat = VK_FORMAT_R32G32B32A32_SFLOAT, + R64_UInt = VK_FORMAT_R64_UINT, + R64_SInt = VK_FORMAT_R64_SINT, + R64_SFloat = VK_FORMAT_R64_SFLOAT, + RG64_UInt = VK_FORMAT_R64G64_UINT, + RG64_SInt = VK_FORMAT_R64G64_SINT, + RG64_SFloat = VK_FORMAT_R64G64_SFLOAT, + RGB64_UInt = VK_FORMAT_R64G64B64_UINT, + RGB64_SInt = VK_FORMAT_R64G64B64_SINT, + RGB64_SFloat = VK_FORMAT_R64G64B64_SFLOAT, + RGBA64_UInt = VK_FORMAT_R64G64B64A64_UINT, + RGBA64_SInt = VK_FORMAT_R64G64B64A64_SINT, + RGBA64_SFloat = VK_FORMAT_R64G64B64A64_SFLOAT, + B10GR11_UFloat_Pack32 = VK_FORMAT_B10G11R11_UFLOAT_PACK32, + E5BGR9_UFloat_Pack32 = VK_FORMAT_E5B9G9R9_UFLOAT_PACK32, D16_UNorm = VK_FORMAT_D16_UNORM, X8_D24_UNorm_Pack32 = VK_FORMAT_X8_D24_UNORM_PACK32, - D32_SFLOAT = VK_FORMAT_D32_SFLOAT, - S8_UINT = VK_FORMAT_S8_UINT, - D16_UNorm_S8_UINT = VK_FORMAT_D16_UNORM_S8_UINT, - D24_UNorm_S8_UINT = VK_FORMAT_D24_UNORM_S8_UINT, - D32_SFLOAT_S8_UINT = VK_FORMAT_D32_SFLOAT_S8_UINT, + D32_SFloat = VK_FORMAT_D32_SFLOAT, + S8_UInt = VK_FORMAT_S8_UINT, + D16_UNorm_S8_UInt = VK_FORMAT_D16_UNORM_S8_UINT, + D24_UNorm_S8_UInt = VK_FORMAT_D24_UNORM_S8_UINT, + D32_SFLOAT_S8_UInt = VK_FORMAT_D32_SFLOAT_S8_UINT, BC1_RGB_UNorm_Block = VK_FORMAT_BC1_RGB_UNORM_BLOCK, BC1_RGB_SRGB_Block = VK_FORMAT_BC1_RGB_SRGB_BLOCK, - BC1_RGBA_UNORM_Block = VK_FORMAT_BC1_RGBA_UNORM_BLOCK, + BC1_RGBA_UNorm_Block = VK_FORMAT_BC1_RGBA_UNORM_BLOCK, BC1_RGBA_SRGB_Block = VK_FORMAT_BC1_RGBA_SRGB_BLOCK, - BC2_UNORM_Block = VK_FORMAT_BC2_UNORM_BLOCK, + BC2_UNorm_Block = VK_FORMAT_BC2_UNORM_BLOCK, BC2_SRGB_Block = VK_FORMAT_BC2_SRGB_BLOCK, - BC3_UNORM_Block = VK_FORMAT_BC3_UNORM_BLOCK, + BC3_UNorm_Block = VK_FORMAT_BC3_UNORM_BLOCK, BC3_SRGB_Block = VK_FORMAT_BC3_SRGB_BLOCK, BC4_UNorm_Block = VK_FORMAT_BC4_UNORM_BLOCK, BC4_SNorm_Block = VK_FORMAT_BC4_SNORM_BLOCK, BC5_UNorm_Block = VK_FORMAT_BC5_UNORM_BLOCK, BC5_SNorm_Block = VK_FORMAT_BC5_SNORM_BLOCK, - BC6H_UFLOAT_Block = VK_FORMAT_BC6H_UFLOAT_BLOCK, - BC6H_SFLOAT_Block = VK_FORMAT_BC6H_SFLOAT_BLOCK, + BC6H_UFloat_Block = VK_FORMAT_BC6H_UFLOAT_BLOCK, + BC6H_SFloat_Block = VK_FORMAT_BC6H_SFLOAT_BLOCK, BC7_UNorm_Block = VK_FORMAT_BC7_UNORM_BLOCK, BC7_SRGB_Block = VK_FORMAT_BC7_SRGB_BLOCK, ETC2_RGB8_UNorm_Block = VK_FORMAT_ETC2_R8G8B8_UNORM_BLOCK, @@ -194,7 +194,7 @@ enum class Format: UnsignedInt { ETC2_RGBA8_SRGB_Block = VK_FORMAT_ETC2_R8G8B8A8_SRGB_BLOCK, EAC_R11_UNorm_Block = VK_FORMAT_EAC_R11_UNORM_BLOCK, EAC_R11_SNorm_Block = VK_FORMAT_EAC_R11_SNORM_BLOCK, - EAC_RG11_UN= VK_FORMAT_EAC_R11G11_UNORM_BLOCK, + EAC_RG11_UNorm_Block = VK_FORMAT_EAC_R11G11_UNORM_BLOCK, EAC_RG11_SNorm_Block = VK_FORMAT_EAC_R11G11_SNORM_BLOCK, ASTC_4x4_UNorm_Block = VK_FORMAT_ASTC_4x4_UNORM_BLOCK, ASTC_4x4_SRGB_Block = VK_FORMAT_ASTC_4x4_SRGB_BLOCK,