diff --git a/Runtime/Scripts/KtxNativeInstance.cs b/Runtime/Scripts/KtxNativeInstance.cs index a393279..1880796 100644 --- a/Runtime/Scripts/KtxNativeInstance.cs +++ b/Runtime/Scripts/KtxNativeInstance.cs @@ -317,8 +317,18 @@ public void Unload() { static GraphicsFormat GetGraphicsFormat(VkFormat vkFormat) { switch (vkFormat) { + case VkFormat.Astc4X4SrgbBlock: return GraphicsFormat.RGBA_ASTC4X4_SRGB; + case VkFormat.Astc4X4UNormBlock: return GraphicsFormat.RGBA_ASTC4X4_UNorm; + case VkFormat.Astc5X5SrgbBlock: return GraphicsFormat.RGBA_ASTC5X5_SRGB; + case VkFormat.Astc5X5UNormBlock: return GraphicsFormat.RGBA_ASTC5X5_UNorm; + case VkFormat.Astc6X6SrgbBlock: return GraphicsFormat.RGBA_ASTC6X6_SRGB; + case VkFormat.Astc6X6UNormBlock: return GraphicsFormat.RGBA_ASTC6X6_UNorm; case VkFormat.Astc8X8SrgbBlock: return GraphicsFormat.RGBA_ASTC8X8_SRGB; case VkFormat.Astc8X8UNormBlock: return GraphicsFormat.RGBA_ASTC8X8_UNorm; + case VkFormat.Astc10X10SrgbBlock: return GraphicsFormat.RGBA_ASTC10X10_SRGB; + case VkFormat.Astc10X10UNormBlock: return GraphicsFormat.RGBA_ASTC10X10_UNorm; + case VkFormat.Astc12X12SrgbBlock: return GraphicsFormat.RGBA_ASTC12X12_SRGB; + case VkFormat.Astc12X12UNormBlock: return GraphicsFormat.RGBA_ASTC12X12_UNorm; case VkFormat.B10G11R11UFloatPack32: return GraphicsFormat.B10G11R11_UFloatPack32; case VkFormat.BC2SrgbBlock: return GraphicsFormat.RGBA_DXT3_SRGB; case VkFormat.BC2UNormBlock: return GraphicsFormat.RGBA_DXT3_UNorm; @@ -362,8 +372,6 @@ static GraphicsFormat GetGraphicsFormat(VkFormat vkFormat) { case VkFormat.A8B8G8R8UNormPack32: case VkFormat.A8B8G8R8UScaledPack32: case VkFormat.Astc10X10SFloatBlockExt: - case VkFormat.Astc10X10SrgbBlock: - case VkFormat.Astc10X10UNormBlock: case VkFormat.Astc10X5SFloatBlockExt: case VkFormat.Astc10X5SrgbBlock: case VkFormat.Astc10X5UNormBlock: @@ -377,8 +385,6 @@ static GraphicsFormat GetGraphicsFormat(VkFormat vkFormat) { case VkFormat.Astc12X10SrgbBlock: case VkFormat.Astc12X10UNormBlock: case VkFormat.Astc12X12SFloatBlockExt: - case VkFormat.Astc12X12SrgbBlock: - case VkFormat.Astc12X12UNormBlock: case VkFormat.Astc3X3X3SFloatBlockExt: case VkFormat.Astc3X3X3SrgbBlockExt: case VkFormat.Astc3X3X3UNormBlockExt: @@ -386,8 +392,6 @@ static GraphicsFormat GetGraphicsFormat(VkFormat vkFormat) { case VkFormat.Astc4X3X3SrgbBlockExt: case VkFormat.Astc4X3X3UNormBlockExt: case VkFormat.Astc4X4SFloatBlockExt: - case VkFormat.Astc4X4SrgbBlock: - case VkFormat.Astc4X4UNormBlock: case VkFormat.Astc4X4X3SFloatBlockExt: case VkFormat.Astc4X4X3SrgbBlockExt: case VkFormat.Astc4X4X3UNormBlockExt: @@ -401,8 +405,6 @@ static GraphicsFormat GetGraphicsFormat(VkFormat vkFormat) { case VkFormat.Astc5X4X4SrgbBlockExt: case VkFormat.Astc5X4X4UNormBlockExt: case VkFormat.Astc5X5SFloatBlockExt: - case VkFormat.Astc5X5SrgbBlock: - case VkFormat.Astc5X5UNormBlock: case VkFormat.Astc5X5X4SFloatBlockExt: case VkFormat.Astc5X5X4SrgbBlockExt: case VkFormat.Astc5X5X4UNormBlockExt: @@ -416,8 +418,6 @@ static GraphicsFormat GetGraphicsFormat(VkFormat vkFormat) { case VkFormat.Astc6X5X5SrgbBlockExt: case VkFormat.Astc6X5X5UNormBlockExt: case VkFormat.Astc6X6SFloatBlockExt: - case VkFormat.Astc6X6SrgbBlock: - case VkFormat.Astc6X6UNormBlock: case VkFormat.Astc6X6X5SFloatBlockExt: case VkFormat.Astc6X6X5SrgbBlockExt: case VkFormat.Astc6X6X5UNormBlockExt: diff --git a/Runtime/Scripts/KtxTexture.cs b/Runtime/Scripts/KtxTexture.cs index a12e6c6..6312ecc 100644 --- a/Runtime/Scripts/KtxTexture.cs +++ b/Runtime/Scripts/KtxTexture.cs @@ -76,6 +76,7 @@ public override async Task LoadTexture2D( result.errorCode = ErrorCode.FormatUnsupportedBySystem; } } + result.orientation = m_Ktx.orientation; } } else { result.errorCode = ErrorCode.UnsupportedVersion;