izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add a new set of ASTC pixel formats for storing high precision normals in RG channels. The texture is encoded as LA for higher precision, swizzled to RG at runtime for shader compatibility with BC5. Requires RHI support.

Browse Source 
Runtime pixel formats are named  PF_ASTC_<blocksize>_NORM_RG. Use texture format name ASTC_NormalRG_Precise for encoding.

[CL 25563983 by ben woodhouse in ue5-main branch]
This commit is contained in:
ben woodhouse
2023-05-22 10:41:55 -04:00
parent 2580d3bc94
commit 31208ca2a1
8 changed files with 57 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Engine/Source/Developer/TextureFormatASTC/Private/TextureFormatASTC.cpp
View File

@@ -85,7 +85,8 @@ class FASTCTextureBuildFunction final : public FTextureBuildFunction
op(ASTC_RGB_HDR) \
op(ASTC_NormalLA) \
op(ASTC_NormalAG) \
op(ASTC_NormalRG)
op(ASTC_NormalRG) \
op(ASTC_NormalRG_Precise) // Encoded as LA for precision, mapped to RG at runtime. RHI needs to support PF_ASTC_*_NORM_RG formats (requires runtime swizzle)
#define DECL_FORMAT_NAME(FormatName) static FName GTextureFormatName##FormatName = FName(TEXT(#FormatName));
ENUM_SUPPORTED_FORMATS(DECL_FORMAT_NAME);
@@ -123,9 +124,10 @@ class FASTCTextureBuildFunction final : public FTextureBuildFunction
static bool IsNormalMapFormat(FName TextureFormatName)
{
return
TextureFormatName == GTextureFormatNameASTC_NormalAG ||
TextureFormatName == GTextureFormatNameASTC_NormalRG ||
TextureFormatName == GTextureFormatNameASTC_NormalLA;
TextureFormatName == GTextureFormatNameASTC_NormalAG ||
TextureFormatName == GTextureFormatNameASTC_NormalRG ||
TextureFormatName == GTextureFormatNameASTC_NormalLA ||
TextureFormatName == GTextureFormatNameASTC_NormalRG_Precise;
}
static int32 GetDefaultCompressionBySizeValue(FCbObjectView InFormatConfigOverride)
@@ -206,6 +208,10 @@ static EPixelFormat GetQualityFormat(const FTextureBuildSettings& BuildSettings)
if ( bIsNormalMap )
{
if ( BuildSettings.TextureFormatName == GTextureFormatNameASTC_NormalRG_Precise )
{
return PF_ASTC_6x6_NORM_RG;
}
return PF_ASTC_6x6;
}
else if ( bIsHQ )
@@ -373,7 +379,7 @@ static bool ASTCEnc_Compress(
EncConfig.cw_b_weight = 0.0f;
EncConfig.cw_a_weight = 0.0f;
}
else if (BuildSettings.TextureFormatName == GTextureFormatNameASTC_NormalLA)
else if (BuildSettings.TextureFormatName == GTextureFormatNameASTC_NormalLA || BuildSettings.TextureFormatName == GTextureFormatNameASTC_NormalRG_Precise)
{
// L+A mode: rrrg
EncSwizzle.r = ASTCENC_SWZ_B;