The-Homebrew-Cloud/skyline
2
0
Fork 0
mirror of https://github.com/skyline-emu/skyline.git synced 2024-11-23 05:19:18 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fully fill in swizzle component mappings

Browse Source 
Avoids the rest being default initialised to identity, which would break the intended effect of them.
This commit is contained in:
Billy Laws 2022-10-25 21:04:25 +01:00
parent 37ff0ab814
commit 93d43e0115
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/src/main/cpp/skyline/gpu/texture/format.h
View File

@ -74,7 +74,9 @@ namespace skyline::gpu::format {
FORMAT(B5G5R5A1Unorm, 16, eB5G5R5A1UnormPack16); FORMAT(B5G5R5A1Unorm, 16, eB5G5R5A1UnormPack16);
FORMAT(A1B5G5R5Unorm, 16, eA1R5G5B5UnormPack16, .swizzleMapping = { FORMAT(A1B5G5R5Unorm, 16, eA1R5G5B5UnormPack16, .swizzleMapping = {
.r = vk::ComponentSwizzle::eB, .r = vk::ComponentSwizzle::eB,
.b = vk::ComponentSwizzle::eR .g = vk::ComponentSwizzle::eG,
.b = vk::ComponentSwizzle::eR,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(A1R5G5B5Unorm, 16, eA1R5G5B5UnormPack16); FORMAT(A1R5G5B5Unorm, 16, eA1R5G5B5UnormPack16);
@ -84,7 +86,9 @@ namespace skyline::gpu::format {
FORMAT_NORM_INT_SRGB(R8G8B8A8, 32, eR8G8B8A8); FORMAT_NORM_INT_SRGB(R8G8B8A8, 32, eR8G8B8A8);
FORMAT_NORM_INT_SRGB(B8G8R8A8, 32, eR8G8B8A8, .swizzleMapping = { FORMAT_NORM_INT_SRGB(B8G8R8A8, 32, eR8G8B8A8, .swizzleMapping = {
.r = vk::ComponentSwizzle::eB, .r = vk::ComponentSwizzle::eB,
.b = vk::ComponentSwizzle::eR .g = vk::ComponentSwizzle::eG,
.b = vk::ComponentSwizzle::eR,
.a = vk::ComponentSwizzle::eA
}); // Used by SurfaceFlinger }); // Used by SurfaceFlinger
FORMAT_SUFF_NORM_INT(A2B10G10R10, 32, eA2B10G10R10, Pack32); FORMAT_SUFF_NORM_INT(A2B10G10R10, 32, eA2B10G10R10, Pack32);
FORMAT_SUFF_NORM_INT_SRGB(A8B8G8R8, 32, eA8B8G8R8, Pack32); FORMAT_SUFF_NORM_INT_SRGB(A8B8G8R8, 32, eA8B8G8R8, Pack32);
@ -154,36 +158,56 @@ namespace skyline::gpu::format {
// Depth/Stencil Formats // Depth/Stencil Formats
// All of these have a G->R swizzle // All of these have a G->R swizzle
FORMAT(D16Unorm, 16, eD16Unorm, vka::eDepth, .swizzleMapping = { FORMAT(D16Unorm, 16, eD16Unorm, vka::eDepth, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(D32Float, 32, eD32Sfloat, vka::eDepth, .swizzleMapping = { FORMAT(D32Float, 32, eD32Sfloat, vka::eDepth, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(D24UnormX8Uint, 32, eX8D24UnormPack32, .vkAspect = { FORMAT(D24UnormX8Uint, 32, eX8D24UnormPack32, .vkAspect = {
vka::eDepth vka::eDepth
}, .swizzleMapping = { }, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(D24UnormS8Uint, 32, eD24UnormS8Uint, .vkAspect = { FORMAT(D24UnormS8Uint, 32, eD24UnormS8Uint, .vkAspect = {
vka::eStencil | vka::eDepth vka::eStencil | vka::eDepth
}, .swizzleMapping = { }, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(D32FloatS8Uint, 32, eD32SfloatS8Uint, .vkAspect = { FORMAT(D32FloatS8Uint, 32, eD32SfloatS8Uint, .vkAspect = {
vka::eStencil | vka::eDepth vka::eStencil | vka::eDepth
}, .swizzleMapping = { }, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(S8UintD24Unorm, 32, eD24UnormS8Uint, .vkAspect = { FORMAT(S8UintD24Unorm, 32, eD24UnormS8Uint, .vkAspect = {
vka::eStencil | vka::eDepth vka::eStencil | vka::eDepth
}, .swizzleMapping = { }, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
FORMAT(S8Uint, 32, eS8Uint, .vkAspect = { FORMAT(S8Uint, 32, eS8Uint, .vkAspect = {
vka::eStencil vka::eStencil
}, .swizzleMapping = { }, .swizzleMapping = {
.g = vk::ComponentSwizzle::eR .r = vk::ComponentSwizzle::eR,
.g = vk::ComponentSwizzle::eR,
.b = vk::ComponentSwizzle::eB,
.a = vk::ComponentSwizzle::eA,
}); });
#undef FORMAT #undef FORMAT