From 9823d5cdf21d38c87c37c48a5e38050bbc4b19e7 Mon Sep 17 00:00:00 2001
From: Qing Tao <55564570+VickyAtAZ@users.noreply.github.com>
Date: Mon, 4 Oct 2021 13:30:45 -0700
Subject: [PATCH] LYN-6793 [iOS] [asset_profile] Assets fail to process for iOS
 due to timeouts (#4456)

Signed-off-by: Qing Tao <qingtao@amazon.com>
---
 Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset        | 2 ++
 .../ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset    | 2 ++
 .../Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset    | 2 ++
 .../ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset   | 2 ++
 Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset  | 2 ++
 Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset      | 2 ++
 .../ImageProcessingAtom/Config/NormalsFromDisplacement.preset   | 2 ++
 .../ImageProcessingAtom/Config/NormalsWithSmoothness.preset     | 2 ++
 .../Config/NormalsWithSmoothness_Legacy.preset                  | 2 ++
 Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset       | 2 ++
 Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset   | 2 ++
 .../Config/ReflectanceWithSmoothness_Legacy.preset              | 2 ++
 .../Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset  | 2 ++
 13 files changed, 26 insertions(+)

diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
index e0d043cf20..fe2e7e0cb4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Albedo.preset
@@ -40,6 +40,7 @@
                     "_diffuse"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
@@ -61,6 +62,7 @@
                     "_diffuse"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
index 8c196530e9..19d2b2bbe6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/AlbedoWithGenericAlpha.preset
@@ -37,6 +37,7 @@
                     "_diffuse"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -56,6 +57,7 @@
                     "_diffuse"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
index 638e31f838..d5acef34d6 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/AmbientOcclusion.preset
@@ -28,6 +28,7 @@
                     "_amb",
                     "_ambientocclusion"
                 ],
+                "MaxTextureSize": 2048,
                 "PixelFormat": "ASTC_4x4"
             },
             "ios": {
@@ -41,6 +42,7 @@
                     "_amb",
                     "_ambientocclusion"
                 ],
+                "MaxTextureSize": 2048,
                 "PixelFormat": "ASTC_4x4"
             },
             "mac": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
index 628cd673e9..e2e009afc5 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Decal_AlbedoWithOpacity.preset
@@ -25,6 +25,7 @@
                     "_decal"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -39,6 +40,7 @@
                     "_decal"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
index 8f21ad005b..28ac84d646 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Displacement.preset
@@ -46,6 +46,7 @@
                     "_h"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
                 "SizeReduceLevel": 3,
@@ -71,6 +72,7 @@
                     "_h"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "DiscardAlpha": true,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
index 8f6c846e82..f5e3a79357 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Emissive.preset
@@ -30,6 +30,7 @@
                     "_emit"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "DiscardAlpha": true
             },
             "ios": {
@@ -44,6 +45,7 @@
                     "_emit"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "DiscardAlpha": true
             },
             "mac": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
index 46e97c3443..a960ae41b2 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsFromDisplacement.preset
@@ -28,6 +28,7 @@
                     "_bump"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipRenormalize": true,
                 "MipMapSetting": {
@@ -43,6 +44,7 @@
                     "_bump"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipRenormalize": true,
                 "MipMapSetting": {
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
index b8f6e38ac1..2c66cf9190 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness.preset
@@ -39,6 +39,7 @@
                 ],
                 "PixelFormat": "ASTC_4x4",
                 "PixelFormatAlpha": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "GlossFromNormal": 1,
                 "MipRenormalize": true,
@@ -60,6 +61,7 @@
                 ],
                 "PixelFormat": "ASTC_4x4",
                 "PixelFormatAlpha": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "GlossFromNormal": 1,
                 "MipRenormalize": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
index 58bb02cd72..f7cba42886 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/NormalsWithSmoothness_Legacy.preset
@@ -32,6 +32,7 @@
                 ],
                 "PixelFormat": "ASTC_4x4",
                 "PixelFormatAlpha": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "GlossFromNormal": 1,
                 "UseLegacyGloss": true,
@@ -50,6 +51,7 @@
                 ],
                 "PixelFormat": "ASTC_4x4",
                 "PixelFormatAlpha": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "GlossFromNormal": 1,
                 "UseLegacyGloss": true,
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
index 8b66b30f28..53998583cc 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Opacity.preset
@@ -45,6 +45,7 @@
                     "_blend"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -68,6 +69,7 @@
                     "_blend"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
index e9ea34060b..2ac88dca85 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance.preset
@@ -58,6 +58,7 @@
                     "_rough"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -87,6 +88,7 @@
                     "_rough"
                 ],
                 "PixelFormat": "ASTC_6x6",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
index e868a44096..7a0c137f07 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/ReflectanceWithSmoothness_Legacy.preset
@@ -23,6 +23,7 @@
                     "_spec"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -35,6 +36,7 @@
                     "_spec"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
diff --git a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
index e52b616f48..f59fd594f4 100644
--- a/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
+++ b/Gems/Atom/Asset/ImageProcessingAtom/Config/Reflectance_Linear.preset
@@ -27,6 +27,7 @@
                     "_refl"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"
@@ -41,6 +42,7 @@
                     "_refl"
                 ],
                 "PixelFormat": "ASTC_4x4",
+                "MaxTextureSize": 2048,
                 "IsPowerOf2": true,
                 "MipMapSetting": {
                     "MipGenType": "Box"