Commit Graph

84 Commits

Author SHA1 Message Date
amzn-phist 7b7adb8573 Don't require a specific version of Wwise SDK, allow for later versions to be used (#2484)
* Updates the Wwise SDK detection in CMake

Parses AkWwiseSDKVersion.h to obtain the version instead of requiring an
exact version to be installed.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates readme.md information about Wwise

Rewrite some of the setup info about Wwise, mention the two ways in
which Wwise can be found via CMake and that users can install later
versions than the one specified.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Remove unnecessary parts of Wwise version detect

Don't need to parse the file contents, it was only being used to print a
message to CMake.  Simplify the validation to just checking that the SDK
version header exists.  Maybe in the future we can reinstate better
version checking to make sure the version falls within a range.

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>

* Updates capitalization of Audiokinetic name

Signed-off-by: amzn-phist <52085794+amzn-phist@users.noreply.github.com>
2021-07-27 18:18:03 -05:00
Esteban Papp da474357f3 Some var cleanup so it shows better-organized in cmake-gui. Some vars… (#2361)
* Some var cleanup so it shows better-organized in cmake-gui. Some vars were also not following the namign convention we are using
Removed some unnecessary messaging
Fixed a TIF bug where it would report the wrong test in a message, fixed a message that was being triggered
Changed TIF to be enabled just by the binary so running the ci_build scripts locally doesnt trigger TIF messaging
Removed `LY_ENABLE_MULTIPLAYER_COMPRESSION`, it was not being used

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* handling case where a parameter can be empty

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* needs to be var name, not contents

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-26 14:14:56 -07:00
Steve Pham 4d5a985276 Enable AZSLc and Shader Compilation on Linux (#2338)
* Enable Shader Compilation support for Linux
* Add azslc package 3P definition for download
* Add AzslcGeader.azsli nad PlatformHeader.hlsli for Linux/Null and Linux/Vulkan (Copy of Android/Vulkan)
* Enable trait PAL_TRAIT_BUILD_ATOM_ASSET_SHADER_SUPPORTED for Linux
* Add platform builder file dependencies
* Updated AZ_TRAIT_ATOM_SHADERBUILDER_AZSLC to use new 3P linux version of azslc
* Add AtomShaderCapabilities.json, PlatformLimits.azasset for Linux (Copy from Android)
* Fix paths/values for Vulkan_Traits_Linux.h
* Enable trait PAL_TRAIT_BUILD_ATOM_ASSET_SHADER_SUPPORTED for Linux
* Enabled AZ_TRAIT_ATOM_VULKAN_LAYER_LUNARG_STD_VALIDATION_SUPPORT for Linux/Vulkan
* Added AzslcHeader.azsli, PlatformHeader.hlsli dependencies for Linux/Null and Linux/Vulkan in the platform builders for windows and mac for consistency

Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-22 10:16:17 -07:00
Steve Pham 38261d0800 Shorten copyright headers by splitting into 2 lines (#2213)
* Updated all copyright headers to split the longer original copyright line into 2 shorter lines

Signed-off-by: Steve Pham <spham@amazon.com>
2021-07-16 15:25:48 -07:00
Steve Pham 18611a95eb Update qt package hash for Linux
Update to pull in fixed Linux QT Package to resolve missing runtime dependencies
Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-16 15:07:11 -07:00
Steve Pham 6909968ffb Add SPIRVCross for Linux
Signed-off-by: spham-amzn <spham@amazon.com>
2021-07-16 13:18:31 -07:00
Chris Galvan e924ed0b86 Merged stabilization/2106 to development; Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-12 10:45:23 -05:00
Esteban Papp d7c8c0192f SPEC-7503 Mac nightly run asset profile failed to process "Translation/scriptcanvas_en_us.ts" (#1742)
* copy frameworks to output for loose file case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* patching lrelease

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix for python in loose files and bundles

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* found what the problem is, setting a version just in case

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* fixup_bundle working with Python.framework and codesigning on AssetProcessor.app

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Trying to ignore other files to solve Jenkins

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Fix some qt stuff for mac

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* removal of cstemp files to prevent signature failures

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

* Updating Qt with fixes to solve some qt framework issues with include paths

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
2021-07-08 17:20:20 -07:00
hultonha 2ea9bfb144 merge stabilization/2106 into development
Signed-off-by: hultonha <hultonha@amazon.co.uk>
2021-07-06 17:34:04 +01:00
amzn-hdoke 1dfe65a3ef Update AWSNativeSDK-Android revision and enable AWS gems (#1837)
Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-04 15:47:17 -07:00
Chris Galvan d7574777a8 Resolved merge conflicts
Signed-off-by: Chris Galvan <chgalvan@amazon.com>
2021-07-02 12:42:44 -05:00
SJ 5eb0b79417 Increment AWS native SDK Android package version number. This fixes curl library not being copied into APK. (#1728) 2021-07-02 09:46:18 -07:00
amzn-hdoke d365ff51d6 [AWS][Gems] Fix for Linux Release Monolithic Builds (#1739)
* Add missing 3rd party deps to Metrics gem

Signed-off-by: dhrudesh <dhrudesh@amazon.com>

* Set AWSNativeSDK-linux revision to 5

Signed-off-by: dhrudesh <dhrudesh@amazon.com>
2021-07-02 08:24:42 -07:00
Steve Pham b4a2edec6a Final update copyright headers to reference license files at the repo root (#1693)
* Final update copyright headers to reference license files at the repo root

Signed-off-by: spham <spham@amazon.com>

* Fix copyright validator unit tests to support the stale O3DE header scenario

Signed-off-by: spham <spham@amazon.com>
2021-06-30 19:51:55 -07:00
AMZN-stankowi 0095e5aa6a Updated AssImp to rev11, latest build for all platforms (#1563) 2021-06-29 10:50:42 -07:00
Gene Walters 4e14c0069b Merge branch 'upstream/stabilization/2106' into genewalt/gitflow_210628 2021-06-28 19:09:20 -07:00
galibzon 01b2079790 [ATOM-15801] AZSLc NoMSAA translation needs to initialize the third (#1529)
argument of GetDimensions() to 1

azslc v1.7.23

Signed-off-by: garrieta <garrieta@amazon.com>
2021-06-23 18:08:09 -05:00
Steve Pham 70042fcdcd O3DE Copyright Updates for Linux Foundation (#1504) 2021-06-23 10:55:22 -07:00
SJ d5490ecf69 Update AWS android package version to rev4
Merge pull request #1461 from aws-lumberyard-dev/LYN-4593
2021-06-22 09:39:20 -07:00
amzn-sj 484339c4b8 Update AWS android package version to rev4 2021-06-18 12:56:29 -07:00
Chris Burel 7486488b60 Update to PhysX 4.1.2.29882248 (#1411)
* Update to PhysX-4.1.2.29882248

* Add maybe_unused attribute for variable not used in the release config
2021-06-18 09:53:22 -07:00
Esteban Papp 98767862af LYN-4071 Mac compile times are excessive 2021-06-17 13:41:36 -07:00
AMZN-stankowi 1fd0886b70 Updated AssImp to v10 for Windows Invert PostRotation matrix in animation chains (#1340) 2021-06-16 08:32:47 -07:00
pappeste 6ea8017646 Update qt versions and add missing dependency 2021-06-15 17:33:34 -07:00
galibzon cdce00bf35 [ATOM-13770] [Shaders] - Root Constants need to be padded to be 16 byte (#1326)
aligned.

AZSLc v1.7.22 now has command line option "--pad-root-const":
Automatically append padding data to the root constant CB to keep it
aligned to 16-byte boundary.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-06-15 10:58:09 -05:00
Chris Burel 1f48985a0e Update Blast to the latest version, eb169fe (#1076) 2021-06-04 11:09:26 -07:00
Nicholas Lawson 01f69acc5f Cleans up remaining 3p package todos (#1080)
Removes Clang
Adds a required LICENSE.TXT to the folder of glad in atom.
2021-06-02 07:38:39 -07:00
Steve Pham 600f97a46c Updating DirectXShaderCompiler 3P Packages to use built-from-source version (#976) 2021-05-27 09:41:45 -07:00
AMZN-stankowi b37be6cdbf New AssImp build, just for Windows. This has the crash fix with bones. (#875) 2021-05-24 10:41:19 -07:00
moudgils a1cb7cd593 Add windows package 2021-05-21 15:36:06 -07:00
moudgils 2146d9982a Update SpirvCross package 2021-05-21 09:59:07 -07:00
moudgils 5a149a4594 Merge branch 'main' into DxcExperiment 2021-05-20 11:56:35 -07:00
galibzon 256df54575 [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System (#749)
* [ATOM-15276] Shader Build Pipeline: Add Shader Supervariant System.

Added ShaderAssetBuilder2 & ShaderVariantAssetBuilder2.

Added ShaderAsset2, ShaderVariantAsset2.

Eventually they will be the only builders. AzslBuilder &
SrgLayoutBuilder will be removed.
ShaderResourceGroupAsset will be removed. ShaderAssetBuilder &
ShaderVariantAssetBuilder will be replaced.

Signed-off-by: garrieta <garrieta@amazon.com>
2021-05-20 04:53:16 -05:00
moudgils aa79dfbf95 Update hash for 3rdParty cmake file 2021-05-18 21:29:23 -07:00
moudgils a4a22a2cfa Merge branch 'DxcExperiment' of https://github.com/aws-lumberyard-dev/o3de into DxcExperiment 2021-05-18 20:43:07 -07:00
moudgils 1ebb7c405f Merge branch 'main' into DxcExperiment 2021-05-18 20:24:52 -07:00
moudgils 0a2c95cc20 Add Mac's dxc package 2021-05-18 17:42:41 -07:00
moudgils 83f29f4a34 Updated to one Dxc package 2021-05-17 20:39:39 -07:00
Steve Pham 8601ffa27b Set MCPP 3rd Party Package to new OS-specific packages including Linux
- Add MCPP 3PP definition for Linux
- Update mcpp 3PP definition from -multiplatform to -windows on windows
- Update mcpp 3PP definition from -multiplatform to -mac on mac
2021-05-17 14:17:42 -07:00
moudgils b225dcfa79 Update cmake to use the new Dxc binaries for windows 2021-05-12 19:37:44 -07:00
Eric Phister ab8738b7c3 Updating to support Wwise SDK 2021.1.1.X (#686)
* Code updates for Wwise 2021.1.X support.

* [WIP] CMake updates for Wwise 2021.1.X support.

* Updates FindWwise.cmake to search for a Wwise install or let user set it as cache variable.

* Makes Wwise SDK optional, and the AudioEngineWwise Gem will revert to a 'stub' build if no SDK found.

* Adding a .gitignore for Wwise project files.

* Updates a .wcmdline file for integration into Wwise projects.

* Updates the cmake messaging regarding Wwise SDK and smooths out some of configuration scenarios.

* Updates the Wwise project for AutomatedTesting to ver 2021.1.1.7601 and rebuilds banks.
2021-05-11 15:16:32 -05:00
AMZN-stankowi e22debec54 ATOM-15465: Helios rollback AssImp SDK version, this fixes the rotation bug (#608) (#641)
ATOM-15465: Fix issue with incorrect rotation on models.

* Revert "{LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545)"

This reverts commit 06d2050ac4fe6b9d0d0c52e759cf73a9a3f7d3eb.

* bumping version to force assets to reprocess
2021-05-07 10:37:29 -07:00
AMZN-stankowi a7224b6379 Integrating github/Helios_RemoveFbxSdk through commit 6dc2604 (#391) (#560)
Removing FBX SDK, LYN-1045. If you have an issues please reach out to the Helios team.
2021-05-05 09:29:12 -07:00
nvsickle d4f19cb0b5 Fix Mac build 2021-05-04 15:59:28 -07:00
sharmajs-amzn f5f035122b {LYN-3229} Update AssImp package with latest AssImp 3rd party source changes (#545) (#554) 2021-05-04 15:00:02 -07:00
nvsickle 677205d063 Merge remote-tracking branch 'upstream/main' into nvsickle/MinorQtFixes 2021-05-04 10:46:03 -07:00
nvsickle 896738ccff Update Qt 3rdParty packages to fix a minor CMake issue 2021-04-30 16:08:43 -07:00
pconroy 27c6f23828 Remove remaining dyad references and files 2021-04-29 19:44:29 -07:00
Alex Peterson 7aeb9614de Remove remaining libav references 2021-04-27 16:27:10 -07:00
Junbo Liang 83f3cbd4a1 Merge pull request #151 from aws-lumberyard-dev/SPEC-6072
[SPEC-6072] [Crashpad] Migrate crash reporting tool to use Crashpad from 3rdParty
2021-04-27 12:13:21 -07:00