LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-16 16:20:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

Compressed texture formats have explicit sRGB variants

Browse Source
This commit is contained in:
Sasha Szpakowski
2023-10-14 15:01:01 -03:00
parent 9eec1754e7
commit 343d192f10
26 changed files with 890 additions and 512 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/image/magpie/ASTCHandler.cpp
+14 -14
View File
@@ -54,33 +54,33 @@ static PixelFormat convertFormat(uint32 blockX, uint32 blockY, uint32 blockZ)
return PIXELFORMAT_UNKNOWN;
if (blockX == 4 && blockY == 4)
return PIXELFORMAT_ASTC_4x4;
return PIXELFORMAT_ASTC_4x4_UNORM;
else if (blockX == 5 && blockY == 4)
return PIXELFORMAT_ASTC_5x4;
return PIXELFORMAT_ASTC_5x4_UNORM;
else if (blockX == 5 && blockY == 5)
return PIXELFORMAT_ASTC_5x5;
return PIXELFORMAT_ASTC_5x5_UNORM;
else if (blockX == 6 && blockY == 5)
return PIXELFORMAT_ASTC_6x5;
return PIXELFORMAT_ASTC_6x5_UNORM;
else if (blockX == 6 && blockY == 6)
return PIXELFORMAT_ASTC_6x6;
return PIXELFORMAT_ASTC_6x6_UNORM;
else if (blockX == 8 && blockY == 5)
return PIXELFORMAT_ASTC_8x5;
return PIXELFORMAT_ASTC_8x5_UNORM;
else if (blockX == 8 && blockY == 6)
return PIXELFORMAT_ASTC_8x6;
return PIXELFORMAT_ASTC_8x6_UNORM;
else if (blockX == 8 && blockY == 8)
return PIXELFORMAT_ASTC_8x8;
return PIXELFORMAT_ASTC_8x8_UNORM;
else if (blockX == 10 && blockY == 5)
return PIXELFORMAT_ASTC_10x5;
return PIXELFORMAT_ASTC_10x5_UNORM;
else if (blockX == 10 && blockY == 6)
return PIXELFORMAT_ASTC_10x6;
return PIXELFORMAT_ASTC_10x6_UNORM;
else if (blockX == 10 && blockY == 8)
return PIXELFORMAT_ASTC_10x8;
return PIXELFORMAT_ASTC_10x8_UNORM;
else if (blockX == 10 && blockY == 10)
return PIXELFORMAT_ASTC_10x10;
return PIXELFORMAT_ASTC_10x10_UNORM;
else if (blockX == 12 && blockY == 10)
return PIXELFORMAT_ASTC_12x10;
return PIXELFORMAT_ASTC_12x10_UNORM;
else if (blockX == 12 && blockY == 12)
return PIXELFORMAT_ASTC_12x12;
return PIXELFORMAT_ASTC_12x12_UNORM;
return PIXELFORMAT_UNKNOWN;
}
src/modules/image/magpie/KTXHandler.cpp
+14 -14
View File
@@ -221,59 +221,59 @@ PixelFormat convertFormat(uint32 glformat, bool &sRGB)
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_4x4_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_4x4_KHR:
return PIXELFORMAT_ASTC_4x4;
return PIXELFORMAT_ASTC_4x4_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x4_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_5x4_KHR:
return PIXELFORMAT_ASTC_5x4;
return PIXELFORMAT_ASTC_5x4_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_5x5_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_5x5_KHR:
return PIXELFORMAT_ASTC_5x5;
return PIXELFORMAT_ASTC_5x5_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x5_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_6x5_KHR:
return PIXELFORMAT_ASTC_6x5;
return PIXELFORMAT_ASTC_6x5_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_6x6_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_6x6_KHR:
return PIXELFORMAT_ASTC_6x6;
return PIXELFORMAT_ASTC_6x6_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x5_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_8x5_KHR:
return PIXELFORMAT_ASTC_8x5;
return PIXELFORMAT_ASTC_8x5_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x6_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_8x6_KHR:
return PIXELFORMAT_ASTC_8x6;
return PIXELFORMAT_ASTC_8x6_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_8x8_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_8x8_KHR:
return PIXELFORMAT_ASTC_8x8;
return PIXELFORMAT_ASTC_8x8_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x5_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_10x5_KHR:
return PIXELFORMAT_ASTC_10x5;
return PIXELFORMAT_ASTC_10x5_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x6_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_10x6_KHR:
return PIXELFORMAT_ASTC_10x6;
return PIXELFORMAT_ASTC_10x6_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x8_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_10x8_KHR:
return PIXELFORMAT_ASTC_10x8;
return PIXELFORMAT_ASTC_10x8_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_10x10_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_10x10_KHR:
return PIXELFORMAT_ASTC_10x10;
return PIXELFORMAT_ASTC_10x10_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x10_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_12x10_KHR:
return PIXELFORMAT_ASTC_12x10;
return PIXELFORMAT_ASTC_12x10_UNORM;
case KTX_GL_COMPRESSED_SRGB8_ALPHA8_ASTC_12x12_KHR:
sRGB = true;
case KTX_GL_COMPRESSED_RGBA_ASTC_12x12_KHR:
return PIXELFORMAT_ASTC_12x12;
return PIXELFORMAT_ASTC_12x12_UNORM;
default:
return PIXELFORMAT_UNKNOWN;
}
src/modules/image/magpie/PVRHandler.cpp
+14 -14
View File
@@ -256,33 +256,33 @@ static PixelFormat convertFormat(PVRV3PixelFormat format, PVRV3ChannelType chann
case ePVRTPF_EAC_RG:
return snorm ? PIXELFORMAT_EAC_RG_SNORM : PIXELFORMAT_EAC_RG_UNORM;
case ePVRTPF_ASTC_4x4:
return PIXELFORMAT_ASTC_4x4;
return PIXELFORMAT_ASTC_4x4_UNORM;
case ePVRTPF_ASTC_5x4:
return PIXELFORMAT_ASTC_5x4;
return PIXELFORMAT_ASTC_5x4_UNORM;
case ePVRTPF_ASTC_5x5:
return PIXELFORMAT_ASTC_5x5;
return PIXELFORMAT_ASTC_5x5_UNORM;
case ePVRTPF_ASTC_6x5:
return PIXELFORMAT_ASTC_6x5;
return PIXELFORMAT_ASTC_6x5_UNORM;
case ePVRTPF_ASTC_6x6:
return PIXELFORMAT_ASTC_6x6;
return PIXELFORMAT_ASTC_6x6_UNORM;
case ePVRTPF_ASTC_8x5:
return PIXELFORMAT_ASTC_8x5;
return PIXELFORMAT_ASTC_8x5_UNORM;
case ePVRTPF_ASTC_8x6:
return PIXELFORMAT_ASTC_8x6;
return PIXELFORMAT_ASTC_8x6_UNORM;
case ePVRTPF_ASTC_8x8:
return PIXELFORMAT_ASTC_8x8;
return PIXELFORMAT_ASTC_8x8_UNORM;
case ePVRTPF_ASTC_10x5:
return PIXELFORMAT_ASTC_10x5;
return PIXELFORMAT_ASTC_10x5_UNORM;
case ePVRTPF_ASTC_10x6:
return PIXELFORMAT_ASTC_10x6;
return PIXELFORMAT_ASTC_10x6_UNORM;
case ePVRTPF_ASTC_10x8:
return PIXELFORMAT_ASTC_10x8;
return PIXELFORMAT_ASTC_10x8_UNORM;
case ePVRTPF_ASTC_10x10:
return PIXELFORMAT_ASTC_10x10;
return PIXELFORMAT_ASTC_10x10_UNORM;
case ePVRTPF_ASTC_12x10:
return PIXELFORMAT_ASTC_12x10;
return PIXELFORMAT_ASTC_12x10_UNORM;
case ePVRTPF_ASTC_12x12:
return PIXELFORMAT_ASTC_12x12;
return PIXELFORMAT_ASTC_12x12_UNORM;
default:
return PIXELFORMAT_UNKNOWN;
}