birkeh
/
o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

LYN-6793 [iOS] [asset_profile] 4 assets fail to process for iOS (#4268)

Browse Source 
* LYN-6793 [iOS] [asset_profile] 4 assets fail to process for iOS
The issue was because the compression of ETC formats took too long.
Replaced all ETC and PVRTC formats with ASTC formats.
Update all pixel operation for formats with single R channel to align the change with R8.

Signed-off-by: Qing Tao <qingtao@amazon.com>
monroegm-disable-blank-issue-2
Qing Tao 4 years ago committed by GitHub
parent e0eeb6369c
commit 62f7fbb665
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File

16
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Converters/PixelOperation.cpp
Unescape Escape View File

@ -248,8 +248,8 @@ namespace ImageProcessingAtom
{ {
const uint8* data = buf; const uint8* data = buf;
r = U8ToF32(data[0]); r = U8ToF32(data[0]);
g = 0.f; g = r;
b = 0.f; b = r;
a = 1.f; a = 1.f;
} }
@ -333,8 +333,8 @@ namespace ImageProcessingAtom
{ {
const uint16* data = (uint16*)(buf); const uint16* data = (uint16*)(buf);
r = U16ToF32(data[0]); r = U16ToF32(data[0]);
g = 0.f; g = r;
b = 0.f; b = r;
a = 1.f; a = 1.f;
} }
@ -418,8 +418,8 @@ namespace ImageProcessingAtom
{ {
const float* data = (float*)(buf); const float* data = (float*)(buf);
r = data[0]; r = data[0];
g = 0.f; g = r;
b = 0.f; b = r;
a = 1.f; a = 1.f;
} }
@ -485,8 +485,8 @@ namespace ImageProcessingAtom
{ {
const SHalf* data = (SHalf*)(buf); const SHalf* data = (SHalf*)(buf);
r = data[0]; r = data[0];
g = 0.f; g = r;
b = 0.f; b = r;
a = 1.f; a = 1.f;
} }

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
Unescape Escape View File

@ -39,7 +39,7 @@
"_bc", "_bc",
"_diffuse" "_diffuse"
], ],
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"DiscardAlpha": true, "DiscardAlpha": true,
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {

2
Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithCoverage.preset
Unescape Escape View File

@ -36,7 +36,7 @@
"_bc", "_bc",
"_diffuse" "_diffuse"
], ],
"PixelFormat": "ETC2a1", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
Unescape Escape View File

@ -36,7 +36,7 @@
"_bc", "_bc",
"_diffuse" "_diffuse"
], ],
"PixelFormat": "ETC2a", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithOpacity.preset
Unescape Escape View File

@ -36,7 +36,7 @@
"_bc", "_bc",
"_diffuse" "_diffuse"
], ],
"PixelFormat": "ETC2a", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

4
Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
Unescape Escape View File

@ -28,7 +28,7 @@
"_amb", "_amb",
"_ambientocclusion" "_ambientocclusion"
], ],
"PixelFormat": "EAC_R11" "PixelFormat": "ASTC_4x4"
}, },
"ios": { "ios": {
"UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}", "UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}",
@ -41,7 +41,7 @@
"_amb", "_amb",
"_ambientocclusion" "_ambientocclusion"
], ],
"PixelFormat": "EAC_R11" "PixelFormat": "ASTC_4x4"
}, },
"mac": { "mac": {
"UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}", "UUID": "{02ED0ECE-B198-49D9-85BC-CEBA6C28546C}",

4
Gems/Atom/Asset/ImageProcessingAtom/Config/CloudShadows.preset
Unescape Escape View File

@ -15,14 +15,14 @@
"UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}", "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
"Name": "CloudShadows", "Name": "CloudShadows",
"DestColor": "Linear", "DestColor": "Linear",
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true "IsPowerOf2": true
}, },
"ios": { "ios": {
"UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}", "UUID": "{884B5F7C-44AC-4E9E-8B8A-559D098BE2C7}",
"Name": "CloudShadows", "Name": "CloudShadows",
"DestColor": "Linear", "DestColor": "Linear",
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true "IsPowerOf2": true
}, },
"mac": { "mac": {

4
Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
Unescape Escape View File

@ -24,13 +24,13 @@
"FileMasks": [ "FileMasks": [
"_decal" "_decal"
], ],
"PixelFormat": "ETC2a", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"
}, },
// Decal Texture Arrays need all mips available immediately for packing. // Decal Texture Arrays need all mips available immediately for packing.
"NumberResidentMips": 255 "NumberResidentMips": 255
}, },
"ios": { "ios": {
"UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}", "UUID": "{E06B5087-2640-49B6-B9BA-D40048162B90}",

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Detail_MergedAlbedoNormalsSmoothness.preset
Unescape Escape View File

@ -26,7 +26,7 @@
"FileMasks": [ "FileMasks": [
"_detail" "_detail"
], ],
"PixelFormat": "ETC2a", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

4
Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
Unescape Escape View File

@ -45,7 +45,7 @@
"_ht", "_ht",
"_h" "_h"
], ],
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"DiscardAlpha": true, "DiscardAlpha": true,
"IsPowerOf2": true, "IsPowerOf2": true,
"SizeReduceLevel": 3, "SizeReduceLevel": 3,
@ -70,7 +70,7 @@
"_ht", "_ht",
"_h" "_h"
], ],
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"DiscardAlpha": true, "DiscardAlpha": true,
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
Unescape Escape View File

@ -29,7 +29,7 @@
"_em", "_em",
"_emit" "_emit"
], ],
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"DiscardAlpha": true "DiscardAlpha": true
}, },
"ios": { "ios": {

4
Gems/Atom/Asset/ImageProcessingAtom/Config/Greyscale.preset
Unescape Escape View File

@ -26,7 +26,7 @@
"FileMasks": [ "FileMasks": [
"_mask" "_mask"
], ],
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"
@ -40,7 +40,7 @@
"FileMasks": [ "FileMasks": [
"_mask" "_mask"
], ],
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/LensOptics.preset
Unescape Escape View File

@ -12,7 +12,7 @@
"android": { "android": {
"UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}", "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",
"Name": "LensOptics", "Name": "LensOptics",
"PixelFormat": "ETC2" "PixelFormat": "ASTC_4x4"
}, },
"ios": { "ios": {
"UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}", "UUID": "{3000A993-0A04-4E08-A813-DFB1A47A0980}",

4
Gems/Atom/Asset/ImageProcessingAtom/Config/LightProjector.preset
Unescape Escape View File

@ -18,7 +18,7 @@
"UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}", "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
"Name": "LightProjector", "Name": "LightProjector",
"DestColor": "Linear", "DestColor": "Linear",
"PixelFormat": "EAC_RG11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"
@ -28,7 +28,7 @@
"UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}", "UUID": "{1DFEF41A-D97F-40FB-99D3-C142A3E5225E}",
"Name": "LightProjector", "Name": "LightProjector",
"DestColor": "Linear", "DestColor": "Linear",
"PixelFormat": "EAC_RG11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Minimap.preset
Unescape Escape View File

@ -19,7 +19,7 @@
"UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}", "UUID": "{0D2F4C31-A665-4862-9C63-9E49A58E9A37}",
"Name": "Minimap", "Name": "Minimap",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"SizeReduceLevel": 1, "SizeReduceLevel": 1,
"MipMapSetting": { "MipMapSetting": {

2
Gems/Atom/Asset/ImageProcessingAtom/Config/MuzzleFlash.preset
Unescape Escape View File

@ -18,7 +18,7 @@
"UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}", "UUID": "{8BCC23A5-D08E-458E-B0B3-087C65FA1D31}",
"Name": "MuzzleFlash", "Name": "MuzzleFlash",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

4
Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
Unescape Escape View File

@ -44,7 +44,7 @@
"_msk", "_msk",
"_blend" "_blend"
], ],
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"
@ -67,7 +67,7 @@
"_msk", "_msk",
"_blend" "_blend"
], ],
"PixelFormat": "EAC_R11", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
Unescape Escape View File

@ -57,7 +57,7 @@
"_roughness", "_roughness",
"_rough" "_rough"
], ],
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
Unescape Escape View File

@ -22,7 +22,7 @@
"FileMasks": [ "FileMasks": [
"_spec" "_spec"
], ],
"PixelFormat": "ETC2a", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
Unescape Escape View File

@ -26,7 +26,7 @@
"_spec", "_spec",
"_refl" "_refl"
], ],
"PixelFormat": "ETC2", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

4
Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image.preset
Unescape Escape View File

@ -19,7 +19,7 @@
"SourceColor": "Linear", "SourceColor": "Linear",
"DestColor": "Linear", "DestColor": "Linear",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "ETC2", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true "IsPowerOf2": true
}, },
"ios": { "ios": {
@ -28,7 +28,7 @@
"SourceColor": "Linear", "SourceColor": "Linear",
"DestColor": "Linear", "DestColor": "Linear",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "PVRTC4", "PixelFormat": "ASTC_4x4",
"IsPowerOf2": true "IsPowerOf2": true
}, },
"mac": { "mac": {

4
Gems/Atom/Asset/ImageProcessingAtom/Config/SF_Image_nonpower2.preset
Unescape Escape View File

@ -18,7 +18,7 @@
"SourceColor": "Linear", "SourceColor": "Linear",
"DestColor": "Linear", "DestColor": "Linear",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "ETC2" "PixelFormat": "ASTC_4x4"
}, },
"ios": { "ios": {
"UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}", "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",
@ -26,7 +26,7 @@
"SourceColor": "Linear", "SourceColor": "Linear",
"DestColor": "Linear", "DestColor": "Linear",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "PVRTC4" "PixelFormat": "ASTC_4x4"
}, },
"mac": { "mac": {
"UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}", "UUID": "{C456B8AB-C360-4822-BCDD-225252D0E697}",

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo.preset
Unescape Escape View File

@ -21,7 +21,7 @@
"Name": "Terrain_Albedo", "Name": "Terrain_Albedo",
"SourceColor": "Linear", "SourceColor": "Linear",
"DestColor": "Linear", "DestColor": "Linear",
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"HighPassMip": 5, "HighPassMip": 5,
"MipMapSetting": { "MipMapSetting": {

2
Gems/Atom/Asset/ImageProcessingAtom/Config/Terrain_Albedo_HighPassed.preset
Unescape Escape View File

@ -20,7 +20,7 @@
"Name": "Terrain_Albedo_HighPassed", "Name": "Terrain_Albedo_HighPassed",
"SourceColor": "Linear", "SourceColor": "Linear",
"DestColor": "Linear", "DestColor": "Linear",
"PixelFormat": "ETC2", "PixelFormat": "ASTC_6x6",
"IsPowerOf2": true, "IsPowerOf2": true,
"MipMapSetting": { "MipMapSetting": {
"MipGenType": "Box" "MipGenType": "Box"

2
Gems/Atom/Asset/ImageProcessingAtom/Config/UserInterface_Compressed.preset
Unescape Escape View File

@ -17,7 +17,7 @@
"UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}", "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",
"Name": "UserInterface_Compressed", "Name": "UserInterface_Compressed",
"SuppressEngineReduce": true, "SuppressEngineReduce": true,
"PixelFormat": "ETC2" "PixelFormat": "ASTC_6x6"
}, },
"ios": { "ios": {
"UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}", "UUID": "{2828FBFE-BDF9-45A7-9370-F93822719CCF}",

Write Preview
Loading…
Cancel
Save