Commit Graph

3427 Commits

Author SHA1 Message Date
Chris Santora c158ca178f Added new shader reinitialization signaling.
This was done while working on "ATOM-15728 Shader Hot Reload Fails in Debug Build", but it turned out these changes did not actually fix the issue (or any other known hot-reload issue). Still, these improvements are appropriate as they correct logical oversights.

ShaderVariant was not listening to asset reloads. It needs to know when the ShaderVariantAsset reload happens so it can reinitialize it's members as well as propagate reinitialization messages. I added a member for the ShaderAsset as the class needs this to reinitialize itself. So now the class listens for reloads of both the ShaderVariantAsset and the ShaderAsset.

Shader was not listening for ShaderAsset reinitialization events.

Updated the API for ShaderReloadNotificationBus's OnShaderVariantReinitialized to include the ShaderVariant which is the most relevant information (the other information wasn't really being used anyway).
2021-06-15 19:26:11 -07:00
Chris Santora 7bfc6dd7cb Merge remote-tracking branch 'upstream/stabilization/2106' into santorac/stabilization/2106/HotReloadFixes 2021-06-15 17:01:19 -07:00
Chris Santora 570f4f5f36 Fixed unit test compile issue 2021-06-15 17:00:30 -07:00
srikappa-amzn 604dca1c3e Merge pull request #1349 from aws-lumberyard-dev/BenchMarksReset
Change create-spawnable benchmarks to not destroy created spawnables immediately
2021-06-15 16:18:02 -07:00
Eric Phister 74491c88b8 Fix AssetBuilders when project-path has a trailing slash (#1345)
* Fixes issues with project paths w/ trailing slash

When launching AP with a --project-path that has a trailing slash, the
AssetBuilders would get that slash instead of a normalized version.
This would mess up the params sent to AssetBuilders.

* Missed a variable name replacement

* Addresses feedback on code style guidelines

Removed 'auto' keyword in favor of explicit types.
2021-06-15 17:50:40 -05:00
Jonny Galloway 7c28b1ff86 Merge pull request #1346 from aws-lumberyard-dev/Atom/gallowj/stabilization/2106
Removing this superfluous data not used by engine
2021-06-15 17:04:52 -05:00
carlitosan 889e6e2b14 Merge pull request #1287 from aws-lumberyard-dev/carlito/stabilization/2106
Remove unwanted entries from ScriptCanvas node palette
2021-06-15 15:01:54 -07:00
srikappa-amzn bd8b6aea8e Moved vector declartion inside state for loop 2021-06-15 14:12:08 -07:00
chcurran 94edb18ed0 disabled upgrade menu until we can stabilize the tool (LYN-3799) 2021-06-15 13:36:03 -07:00
Jonny Galloway 76e0f84670 Merge pull request #1342 from aws-lumberyard-dev/Atom/gallowj/stabilization/2106
Removing the LookDevStudio asset gem from primary o3de repo
2021-06-15 15:31:12 -05:00
gallowj f558e961ae Removing this superflous data not used by engine 2021-06-15 15:30:21 -05:00
yuriy0 e40a598648 Bug fix: check for valid extension in case insensitive manner (#1339) 2021-06-15 12:41:58 -07:00
Chris Santora 03171fee54 Updated AssetInitBus comments. 2021-06-15 12:17:44 -07:00
chcurran 2fd985f162 Fix for unconverted once nodes 2021-06-15 12:13:25 -07:00
chcurran 9f7f6e84a4 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into carlito/stabilization/2106 2021-06-15 12:10:10 -07:00
Mike Balfour ab3aa904f0 Fixed misc slice conversion bugs
* Fixed crash caused by nesting the same slice twice
If the same slice is nested at multiple levels in the same slice hierarchy, the second conversion would reregister the prefab and crash.  Now that case is detected and the slice isn't reconverted.

* Fixed json array patches where multiple elements are removed.
The patches now generate removals from back to front, instead of front to back, so that the indices remain valid as each patch is applied.
2021-06-15 14:00:47 -05:00
gallowj 5c952e2e14 Removing the LookDevStudio asset gem from primary o3de repo 2021-06-15 13:39:18 -05:00
srikappa-amzn 9f9c01e781 Used reserve instead of resize 2021-06-15 11:10:45 -07:00
srikappa-amzn 5b4333e4b1 Added a comment and gave a variable better name 2021-06-15 11:07:43 -07:00
srikappa-amzn c8ba42d04f Merge branch 'stabilization/2106' into BenchMarksReset 2021-06-15 10:59:36 -07:00
cgalvan 13c59385a7 Merge pull request #1332 from aws-lumberyard-dev/cgalvan/FixPrefabActionsWhenDisabled
[LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes.
2021-06-15 12:50:10 -05:00
mrieggeramzn 51ba3e9346 Merge pull request #1300 from aws-lumberyard-dev/Atom/mriegger/bsearchstab
Fixing boundary search
2021-06-15 10:49:36 -07:00
sconel bd2a2ebcf5 Merge pull request #1293 from aws-lumberyard-dev/Prefabs/RemoveEditorInfoFromNestedContainerEntities
Fix nested container entities not getting editor info removed during prefab processing
2021-06-15 10:36:13 -07:00
Aaron Ruiz Mora 62f3c93c68 Fixed HelpPageURL links in physics components (#1328) 2021-06-15 17:51:15 +01:00
moudgils 82c5adaaed Merge pull request #1309 from aws-lumberyard-dev/MetalAsyncBufferFixes
Metal async buffer fixes related to meshes
2021-06-15 09:48:26 -07:00
Steve Pham 0241538c47 Fix Android Startup Error related to bootstrap's project_path being in the target deployed bootstrap path (#1322)
* Add '/Amazon/AzCore/Bootstrap/project_path' to setregbuilder.assetprocessor.setreg/Amazon/AssetBuilder/Excludes
2021-06-15 09:19:29 -07:00
AMZN-tpeng a671ebc699 Merge pull request #1291 from aws-lumberyard-dev/Atom/tonypeng/ATOM-15774
Atom/tonypeng/atom 15774
2021-06-15 09:08:27 -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 Galvan 1aad201a98 [LYN-4527] Make sure the PrefabIntegrationManager is only created when prefabs are enabled, otherwise could result in crashes. 2021-06-15 10:51:36 -05:00
Benjamin Jillich 74e922a401 Compile fix in the editor actor component for release build (#1327) 2021-06-15 17:44:57 +02:00
yuriy0 36deca64d8 Bug fix: pop correct number of upvalues for lua_pushcclosure
This closure used to take one upvalue - the network script binding table - which is now removed. When the network script binding table was removed, the code which pushes the upvalue for lua_pushcclosure was also removed, however, the number of upvalues was not changed.
2021-06-15 08:37:53 -07:00
jckand-amzn ce842eafc9 Merge pull request #1313 from aws-lumberyard-dev/jckand/FoundationAutoStabilization
LYN-4518: Updating expected actions for test_Menus_ViewMenuOptions_Work
2021-06-15 10:04:33 -05:00
Chris Santora 56cf345dba Fixed an issue where vulkan shaders didn't work in AtomSampleViewer because the correct API data wasn't being selected. 2021-06-15 00:11:43 -07:00
Chris Santora 276c3be617 Merge remote-tracking branch 'upstream/stabilization/2106' into santorac/stabilization/2106/HotReloadFixes 2021-06-14 20:45:41 -07:00
Roman 1f6bb14ed3 [EMFX][ATOM] crash during mesh reload (#1301)
* Fixed a crash when entering game mode, removing a mesh and re-adding mesh.
2021-06-14 20:38:37 -07:00
Chris Santora 982406d4d5 Fixed race conditions that could prevent successful hot-reload of shaders.
ATOM-15728 Shader Hot Reload Fails in Debug Build

The main change was to add OnAssetReady handlers to each of the asset classes. See comments in ShaderAsset::OnAssetReady for a detailed explanation. In short, OnAssetReloaded gets missed while assets are being reloaded at the same time on multiple threads, but OnAssetReady is always called whenever connecting to the AssetBus because of its AssetConnectionPolicy.

The above change required the addition of a new AssetInitBus to call the PostLoadInit() functions. Because OnAssetReady connects to buses that are not mutex-protected, they have to be connected on the main thread. AssetInitBus::PostLoadInit is called every frame in RPISystem::SimulationTick. All Atom's asset handlers that need to do post-load initialization must connect to the AssetInitBus, and the asset will disconnect itself after initialization is complete.

We also need the Shader class to handle OnShaderAssetReinitialized to properly handle the shader reload.

With these changes I can click back and forth between "Blending On" and "Blending Off" many times (like 20 times) without issue.
2021-06-14 20:36:12 -07:00
dmcdiarmid-ly 567b54ee25 Merge pull request #1297 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15767
[ATOM-15767] ReflectionScreenSpaceBlurPass uses a fixed number of mips
2021-06-14 19:06:13 -07:00
Doug McDiarmid de4605d6b7 Added comment. 2021-06-14 18:31:43 -07:00
rgba16f 0198f6121b Rebind the DebugDisplayRequestBus Instance to handle drawing in GameMode. (#1275) 2021-06-14 20:29:37 -05:00
Ken Pruiksma 5165f6ad04 [ATOM-15769] Setting minimum angle to 0.5 degrees on disk lights to avoid visual artifacts that occur at values closer to 0. Also updating the outer cone angle max to be 90 degrees since it's measured from the center point, not all the way across. (#1260) 2021-06-14 19:09:27 -05:00
Alex Peterson ecded991b5 Display error when unable to start Python
Added AzFramework Application, logging, unit tests
2021-06-14 17:02:22 -07:00
amzn-mike 364187a87b Merge pull request #1047 from aws-lumberyard-dev/Helios_AssImp_TransformImporterFix
Fix AssImpTransformImporter logic for bone nodes
2021-06-14 18:41:09 -05:00
Jonny Galloway cd9df163fd Merge pull request #1317 from aws-lumberyard-dev/Atom/gallowj/stabilization/2106
Atom/gallowj/stabilization/2106
2021-06-14 18:07:34 -05:00
AMZN-nggieber 948075fa61 Gem Catalog Allows Filtering by Gem Selected Status Live (#1274) 2021-06-14 15:56:54 -07:00
Chris Santora 0d45ec806c Merge pull request #1314 from aws-lumberyard-dev/santorac/stabilization/2106/HotReloadFixes
Updated the usage of ShaderReloadDebugTracker to include the address of the object. This is necessary for debugging where multiple assets may be reloading at the same time. Also added a Printf function for generic messages at the current indent level.

This is specifically in support of:
ATOM-14613 Baseviewer MatertialHotReloadTest fails to change the color after turning blending on and off
ATOM-15728 Shader Hot Reload Fails in Debug Build
2021-06-14 15:42:31 -07:00
jckand-amzn f3ac3fe511 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into jckand/FoundationAutoStabilization 2021-06-14 17:40:17 -05:00
sharmajs-amzn 86d0acf76c fixes for invalid drive letter casing for scanfolder (#1281) 2021-06-14 13:55:37 -07:00
amzn-hdoke 11c3a75321 Enable Client Auth unit test on Linux (#1312) 2021-06-14 13:54:04 -07:00
gallowj 2a2028a597 Merge branch 'stabilization/2106' of https://github.com/aws-lumberyard/o3de into Atom/gallowj/stabilization/2106 2021-06-14 15:52:35 -05:00
gallowj 6c05adddec This material did not look correct, sneaking it in 2021-06-14 15:41:50 -05:00