birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
10,194 Commits 3 Branches 3 Tags
73ca596c359c58c3ca5b96deff7d131336e17b2a
Commit Graph

780 Commits

Author SHA1 Message Date
Esteban Papp 5cca52e73c Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzCore/AzCore/azcore_files.cmake
#	Gems/Atom/Feature/Common/Assets/Materials/Presets/MacBeth/15_red_sRGB.tif
 2021-12-07 13:31:55 -08:00
Esteban Papp cd5306febf Merging from development 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-07 12:35:41 -08:00
Nicholas Van Sickle 3d8664ee92 Merge pull request #5511 from aws-lumberyard-dev/nvsickle/GenericDomJson 
Generic DOM: Add DomBackend abstraction and JSON support
 2021-12-07 11:20:53 -08:00
Nicholas Van Sickle 6cf805256b Make backend write API string-based 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 15:55:35 -08:00
carlitosan 15e26b7515 merge development 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-06 12:21:45 -08:00
Nicholas Van Sickle ea9d7c9d82 Add optional size parameter to ReadFromBufferInPlace 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 10:45:45 -08:00
Nicholas Van Sickle 1c42cd98cc Address a bit more review feedback 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-06 10:31:35 -08:00
Steve Pham be252d797d Remove disabled failed asset load tests trait from linux (#6100) 
* Remove trait AZ_TRAIT_DISABLE_FAILED_ASSET_LOAD_TESTS for Linux

Signed-off-by: Steve Pham <82231385+spham-amzn@users.noreply.github.com>
 2021-12-06 09:11:56 -08:00
Nicholas Van Sickle 8165f54c05 Use temporary lifetimes for test 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-03 13:52:16 -08:00
Esteban Papp 03adf700fe Merge branch 'development' into redcode/driller_removal 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 13:35:16 -08:00
Nicholas Van Sickle 037a93406a Fix a couple format string issues 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-03 12:40:52 -08:00
Nicholas Van Sickle f2f7dad972 Remove FormatVisitorErrorMessage 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-03 12:26:19 -08:00
Esteban Papp bfae86dcf9 Adds missing header needed for mac/ios 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 12:04:03 -08:00
Esteban Papp 799cc68de2 no message 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 11:38:49 -08:00
Nicholas Van Sickle 016e261f36 Add DomUtils 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-03 11:25:15 -08:00
Esteban Papp 620690f2d6 Fixes Windows release build 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-03 10:40:22 -08:00
lumberyard-employee-dm c3fdbfb926 Updated the ComponentApplication Settings Registry initialization to no (#6108) 
longer read form the users `~/.o3de/Registry` directory in non
debug/profile configurations.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-12-03 11:55:23 -06:00
Esteban Papp 5f41e404a5 PR comment 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 18:12:40 -08:00
Esteban Papp 7817ed76bf Removes FileIOEventBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 18:08:45 -08:00
Nicholas Van Sickle 59a2216584 Fix a build issue 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-02 17:49:29 -08:00
Nicholas Van Sickle 4dbce4275b Refactor the interface after some chatting with @amazon-employee-dm 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-02 17:46:07 -08:00
Esteban Papp af19b53dde Removes FileIOBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 17:43:47 -08:00
Esteban Papp 498673ada0 Removes Driller from AzCore 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 17:15:46 -08:00
Esteban Papp 5dfd40d056 Removes leftover from profiler tool 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 14:39:38 -08:00
carlitosan 6bd0308339 Merge remote-tracking branch 'origin/development' into sc-editor-asset-redux 
Signed-off-by: carlitosan <82187351+carlitosan@users.noreply.github.com>
 2021-12-02 14:17:35 -08:00
Esteban Papp 59ef6f983f Removes Driller from ScriptCanvas 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 13:55:00 -08:00
Esteban Papp de06bb75e5 Fixes some unit tests due to the removal of the MemoryDriller 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 12:41:32 -08:00
Esteban Papp 19ddeeded9 Removes ThreadDrillerEvents, replaces handlers with TreadEventBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 12:40:39 -08:00
Esteban Papp 8bde44d5fb Removes TraceMessageDrillerBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 10:09:42 -08:00
Esteban Papp 1b01ec18b0 Replaces handlers of TraceMessageDrillerBus with handlers of TraceMessageBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-02 10:09:39 -08:00
Esteban Papp 59714fb31d Removes MemoryDrillerBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-01 19:27:30 -08:00
Esteban Papp c3f035c4e3 Removes AssetMemoryAnalyzer that relies on the MemoryDrillerBus 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-01 19:08:12 -08:00
Esteban Papp 95ed1015a5 Removes the MemoryDriller 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-01 18:48:07 -08:00
Esteban Papp 075eeee0bd Removes PlatformMemoryInstrumentation.h and PLATFORM_MEMORY_INSTRUMENTATION_ENABLED 
This was part of another instrumentation framework that was never fully integrated

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-01 18:47:23 -08:00
Esteban Papp 3f6246ccbe Removes recording of memory records through the MemoryDriller 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-01 18:21:39 -08:00
Esteban Papp 47de333e94 Removes m_enableDrilling 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-12-01 16:50:45 -08:00
Nicholas Van Sickle 1aaa267585 Fix one last bit of minor feedback 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-01 16:49:48 -08:00
Nicholas Van Sickle 2dddb97b7c One last round of stray review feedback I missed 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-01 16:32:23 -08:00
Nicholas Van Sickle d519d4cb03 Improve performance for both in-place and copy parsing (faster than AZ::JsonSerializationUtils::ReadJsonString now!) 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-01 16:22:48 -08:00
Nicholas Van Sickle e0508ddefc Make JsonBackend templated 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-12-01 12:10:22 -08:00
lumberyard-employee-dm e8750f8096 Rename sr_regset-file CVar to sr_regset_file (#6067) 
The Legacy Cry XConsole code validates that CVars only contain
underscore and alphanumeric characters via an Assert in `debug`
configurations.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-12-01 13:16:19 -06:00
amzn-mike 828431f185 Update AssetManager unit tests to not interact with the disk (#5815) 
* Changed AssetManager tests to use memory streams for asset reading/writing

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fix compilation on non-unity builds

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Fixed handling of path lookups when test folder path is non-empty

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add more detailed error message for "asset is not loaded"

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Make numThreads a constexpr

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add FindFile function

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove unused lambda capture

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Remove trailing whitespace

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>

* Add size to assert

Signed-off-by: amzn-mike <80125227+amzn-mike@users.noreply.github.com>
 2021-12-01 09:05:35 -06:00
Nicholas Van Sickle f87021d856 Expose JSON parse flag options 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-30 22:08:48 -08:00
Nicholas Van Sickle a9c05372d5 API tweaks 
- Use ref types
- Support using rapidjson::Value in lieu of rapidjson::Document
- Use the existing JSON comparison util function in tests

Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-30 18:00:59 -08:00
Esteban Papp fb6e6e339f Add CRC validator (#5857) 
* Adds crc validation checks

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

* Fixes invalid CRCs

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

* Changes test to smoke suite

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

* excludes some test data from the validator

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

* uses pathlib instead of os.path

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

* fixes wrong path to test scripts

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

* Escape not needed

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-11-30 15:07:57 -08:00
Nicholas Van Sickle 5dbe9e387b Address some review feedback, remove DomBackendRegistry 
Signed-off-by: Nicholas Van Sickle <nvsickle@amazon.com>
 2021-11-30 12:10:16 -08:00
lumberyard-employee-dm 879012b1ae Added the --regset-file option for setreg file loading (#5768) 
The SettingsRegistryMergeUtils.cpp now supports specifying a path to a JSON Merge Patch formated settings registry file via the --regset-file option.
The option supports specify an anchor key to merge the settings underneath that is separated from the filepath via "::"
Ex. `--regset-file="Registry/custom.setreg::/Custom/Anchor"`

An AZ::Console command of "sr_regset-file" has also been added to allow merging of a setting registry file as well.

closes #5767

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
 2021-11-30 13:03:46 -06:00
Scott Romero 12efc84632 [development] minor Profiler gem fixes (#5473) 
Fixed incorrect frame boundary guess when loading a profile capture
Added some missing default initializers
Removed implicit dependency on Atom timing marker constants
Fixed issue with small visualizer viewport bounds when loading a saved capture

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
 2021-11-30 08:27:27 -08:00
rgba16f 768a196b63 Add a way to set the vsync_interval CVar from code (#5813) 
* Add a way to set the render vsync from code

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>

* Update change with PR feedback. Missing whitespace plus a comment on why the assignment is outside the value changed check

Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
 2021-11-30 10:11:26 -06:00
Mike Balfour c0fb80fd99 Workaround for Editor freeze. (#6004) 
GHI bug https://github.com/o3de/o3de/issues/5866 describes a scenario in which the Editor freezes on 6-thread CPUs.  This occurs because the Job Manager ends up with only 2 threads.  The freeze occurs when the main thread spawns a culling job and blocks on it, a Mesh Feature Processor job spawns processing jobs and blocks on them, and a Material/ShaderVariant load queues an asset load and blocks on it.  No new jobs can get started, and the main thread can't continue to process the asset load, so it freezes.
This workaround boosts the minimum number of threads from 2 to 3 by default, which fixes this specific scenario.  The longer-term fix would be to fix any jobs that block on other jobs to no longer block, so that even 1 job thread would work correctly.

Signed-off-by: Mike Balfour <82224783+mbalfour-amzn@users.noreply.github.com>
 2021-11-29 14:38:10 -06:00