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

Configure default Atom assets to be enabled on the linux platform (#3611)

Browse Source 
Signed-off-by: Chris Burel <burelc@amazon.com>
This commit is contained in:
Chris Burel
2021-08-26 12:57:45 -07:00
committed by GitHub
parent 0264a3e7a1
commit ec0278b899
17 changed files with 46 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Editor/EditorCommon.cpp
+4
View File
@@ -103,6 +103,10 @@ namespace ImageProcessingAtomEditor
{
readableString = "PC";
}
else if (platformStrLowerCase == "linux")
{
readableString = "Linux";
}
else if (platformStrLowerCase == "android")
{
readableString = "Android";
Gems/Atom/Asset/ImageProcessingAtom/Code/Source/Platform/Linux/ImageProcessing_Traits_Linux.h
+1 -1
View File
@@ -8,7 +8,7 @@
#pragma once
#define AZ_TRAIT_IMAGEPROCESSING_BESSEL_FUNCTION_FIRST_ORDER j1
#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "pc"
#define AZ_TRAIT_IMAGEPROCESSING_DEFAULT_PLATFORM "linux"
#define AZ_TRAIT_IMAGEPROCESSING_DEFINE_DIRECT3D_CONSTANTS 0
#define AZ_TRAIT_IMAGEPROCESSING_PVRTEXLIB_USE_WINDLL_IMPORT 0
#define AZ_TRAIT_IMAGEPROCESSING_SQUISH_DO_NOT_USE_FASTCALL 1
Gems/Atom/Asset/ImageProcessingAtom/Code/Tests/ImageProcessing_Test.cpp
+1 -1
View File
@@ -928,7 +928,7 @@ namespace UnitTest
PlatformNameList platforms = BuilderSettingManager::Instance()->GetPlatformList();
#ifndef AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
ASSERT_TRUE(platforms.size() == 4);
EXPECT_THAT(platforms, testing::UnorderedPointwise(testing::Eq(), {"pc", "linux", "mac", "ios", "android"}));
#endif //AZ_TOOLS_EXPAND_FOR_RESTRICTED_PLATFORMS
}
Gems/Atom/Asset/ImageProcessingAtom/Config/ImageBuilder.settings
+6
View File
@@ -29,6 +29,12 @@
"Streaming": false,
"Enable": true
},
"linux": {
"GlossScale": 16.0,
"GlossBias": 0.0,
"Streaming": false,
"Enable": true
},
"provo": {
"GlossScale": 16.0,
"GlossBias": 0.0,
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendDistance.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridblenddistance.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBlendIrradiance.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridblendirradiance.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdateColumn.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridborderupdatecolumn.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridBorderUpdateRow.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridborderupdaterow.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridClassification.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridclassification.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRayTracing.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridraytracing.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingClosestHit.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridraytracingclosesthit.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRayTracingMiss.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridraytracingmiss.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRelocation.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridrelocation.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Shaders/DiffuseGlobalIllumination/DiffuseProbeGridRender.precompiledshader
+1 -1
View File
@@ -7,7 +7,7 @@
"ShaderAssetFileName": "diffuseprobegridrender.azshader",
"PlatformIdentifiers":
[
"pc"
"pc", "linux"
],
"RootShaderVariantAssets":
[
Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/AreaTex.dds.assetinfo
+8
View File
@@ -62,6 +62,14 @@
<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
</Class>
</Class>
<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
<Class name="AZStd::string" field="value1" value="linux" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
</Class>
</Class>
</Class>
<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
Gems/Atom/Feature/Common/Assets/Textures/PostProcessing/SearchTex.dds.assetinfo
+8
View File
@@ -62,6 +62,14 @@
<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
</Class>
</Class>
<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
<Class name="AZStd::string" field="value1" value="linux" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
</Class>
</Class>
</Class>
<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>
Gems/Atom/TestData/TestData/Textures/Foliage_Leaves_0_BaseColor.dds.assetinfo
+8
View File
@@ -62,6 +62,14 @@
<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
</Class>
</Class>
<Class name="AZStd::pair" field="element" type="{CAC4E67F-D626-5452-A057-ACB57D53F549}">
<Class name="AZStd::string" field="value1" value="linux" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
<Class name="DataPatch" field="value2" type="{BFF7A3F5-9014-4000-92C7-9B2BC7913DA9}">
<Class name="AZ::Uuid" field="m_targetClassId" value="{980132FF-C450-425D-8AE0-BD96A8486177}" type="{E152C105-A133-4D03-BBF8-3D4B2FBA3E2A}"/>
<Class name="unsigned int" field="m_targetClassVersion" value="1" type="{43DA906B-7DEF-4CA8-9790-854106D3F983}"/>
<Class name="AZStd::unordered_map" field="m_patch" type="{CEA836FC-77E0-5E46-BD0F-2E5A39D845E9}"/>
</Class>
</Class>
</Class>
<Class name="AZStd::string" field="OverridingPlatform" value="" type="{03AAAB3F-5C47-5A66-9EBC-D5FA4DB353C9}"/>
</Class>