Commit Graph

78 Commits (4721ef829835e1d15e413c41cc410ccfa5200ed8)

Author SHA1 Message Date
Qing Tao 9e0756f3c1
ATOM-16656 PassTree tool: ParentPass image attachment preview doesn't work (#5032)
Move imageAttachmentCopy instance from RenderPass to Pass so it can support preview image for all passes but not only for RenderPass.
Fixed an issue with image attachment preview when switching render pipeline with attachment preview on.

Signed-off-by: Qing Tao <qingtao@amazon.com>
4 years ago
AMZN-ScottR 6946145b23 [atom_cpu_profiler_gem_promotion] moved CPU profiler files from Atom into new Profiler gem
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
AMZN-ScottR da75b7ef2b [atom_cpu_profiler_gem_promotion] disconnected Atom CPU profiler preparing for gem promotion
Signed-off-by: AMZN-ScottR <24445312+AMZN-ScottR@users.noreply.github.com>
4 years ago
Scott Romero a95c609bd8
[development] Migrate Atom CPU timing stats tracking to use global stats profiler (#4549)
This change is a preparation for moving the CPU profiler/visualization system from Atom into its own Gem by removing the dependency on local time tracking object AZ::RHI::CpuTimingStatistics

Full changes include:
- Removed all usage of AZ::RHI::CpuTimingStatistics
-- Replaced with pushing to AZ::Statistics::StatisticalProfilerProxy global instance
- Promoted VariableTimer from AZ::RHI to AZ::Debug
- Removed now unused CpuTimingStatistics.h

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
Esteban Papp f3e6adce7f
LYN-6882 release builds are executing code in asserts (#4305)
* adding Windows/release to PR-validation builds

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

* changing trace back to expand to nothing for release

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

* typo

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

* more fixes

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

* fixing some more unused variable cases

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

* renaming file in ScriptCanvas that causes a msbuild warning

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

* reverting a previous change

Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
lumberyard-employee-dm 090aa8f053
Removed ununeeded includes from EBus EBus.h and Policies.h (#4256)
* Removed ununeeded includes from EBus EBus.h and Policies.h

Updated the locations which needed those includes

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Adding missing include for <memory> to AWsClientAuthBus.h

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Remove the while true loop in the EBusQueuePolicy Execute() function

The while true loop in Execute was for allowing additional functions to be queued in the middle of execution of current list of functions.
That functionality was dangerous, because if a queued function added itself during execution unconditionally, then it would result in an infinite loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Updated the AssetManager::DispatchEvents function to pump the AssetBus event queue until empty

Queued Events on the AssetBus is able to queue additional events on that Bus during execution of those events.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Changed the AssetManager::DispatchEvents function to only execute the
AssetBus queued events once

Changed the AssetJobsFloodTest.AssetWithNoLoadReference_LoadDependencies_BehaviorObeyed test to dispatch events until the OnAssetContainerReady callback is signaled.

This happens after every asset load to make sure that the
expiring AssetContainer instances are removed from `AssetManager::m_ownedAssetContainer` container before retrying to load the same asset.

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>

* Added a MaxTimeoutSeconds constant for the maximum amount of the time to run a single DispatchEvents loop

Signed-off-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
Artur K f44169f7fa
Cleanup SerializeContext.h pt.1 (#4264)
* Remove AssetSerializer inclusion from SerializeContext header

Moved a few Reflect methods to new cpp files.

In addition, some preparations for further header dependency reductions.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix smoke test lua failures.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Windows build fixes.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Missing license headers

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix white-space issues.

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Code review fix for AzToolsFramework/AssetEditor/AssetEditorBus.h

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

* Fix inheritance list wrapping broken by older clang-format

Signed-off-by: nemerle <96597+nemerle@users.noreply.github.com>

Co-authored-by: lumberyard-employee-dm <56135373+lumberyard-employee-dm@users.noreply.github.com>
4 years ago
santorac 765f82d945 Merge branch 'development' into Atom/santora/UseLibPng 4 years ago
Scott Romero 36bcf5849a
[development] Migrated Atom CPU profiler to utilize new AzCore Profiler interface and related macros (#4160)
- Added new interface type AZ::Debug::Profiler to externally register profiler systems
 - Modified the Atom CPU profiler to register as an AzCore profiler
 -- This allows full engine markers to be visualized in the associated ImGui tool
 - Converted all AZ_ATOM_PROFILE_* macros to use AZ_PROFILE_* macros instead

Signed-off-by: AMZN-ScottR 24445312+AMZN-ScottR@users.noreply.github.com
4 years ago
santorac 61618e66d3 Fixed a build dependency issue between libpng and zlib on android, thanks to suggestion from @lumberyard-employee-dm
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac bcef5e4952 I think I got the libpng android package working.
Note there is a bit of a dependency hack in Gems\Atom\Feature\Common\Code\CMakeLists.txt to work around a mysterious issue; I'll reach out to some experts for investigation.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 860571f1e3 WIP trying to get android package working.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac c61fc4f67c Removed Error_SaveOverLockedFile because it was failing on mac for some file system reason. This particular test case wasn't that important so it wasn't worth digging into, especially since I don't have a mac handy.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac f99766f556 Update unit test to use AZ::IO::Path.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac b44441b286 Improved PngFile unit test a bit, added another check
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
rgba16f e96793659a Fixes to get Mac & iOS building with new PNG support
Signed-off-by: rgba16f <82187279+rgba16f@users.noreply.github.com>
4 years ago
santorac 3d3324cc2b Merge remote-tracking branch 'upstream/development' into Atom/santora/UseLibPng
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 849a8da4d9 Added unit tests for PngFile.
Fixed a couple issue like palettized files would not load, and stripping alpha was not affecting the color type reported by libpng. Also cleaned up some error reporting.
Added AzFramework to Atom/Utils tests to support PngFile testing.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac a9c6909a29 Renamed PngImage to PngFile and put it in a Utils namespace to match the other file utilities.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
santorac 7a8eb8eda5 Added a new PngImage utility class that wraps libpng. This replaces the use of OpenImageIO in O3DE (although OpenImageIO is still a build dependency for now).
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Esteban Papp ec8e6bcadf Fixes clang cases
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
santorac 675af8692d WIP switching from OpenImageIO to libpng.
Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
4 years ago
Steve Pham fa0f2a1007
Fix unused warnings release (#3677)
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Windows
* Release build fix for Android
* Release build fix for Linux
* Release build fix for Mac
* Release build fix for iOS

Signed-off-by: Steve Pham <spham@amazon.com>
4 years ago
Qing Tao c32740ad53
Removed all preview.png and references of preview.png in all Atom related gems. (#3664)
Signed-off-by: qingtao <qingtao@amazon.com>
4 years ago
Esteban Papp 9c7b55a31d Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/Code/Include/Atom/RHI.Reflect/Bits.h
#	Gems/Atom/RHI/Code/Include/Atom/RHI/IndexBufferView.h
#	Gems/Atom/Tools/MaterialEditor/Code/Source/Window/MaterialEditorWindow.cpp
#	Gems/Atom/Tools/ShaderManagementConsole/Code/Source/Window/ShaderManagementConsoleWindow.cpp
4 years ago
Jacob Hilliard 246621fda5
Visualizer: finish deserialization of captures (#3293)
* Visualizer: Initial capture loading support

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Deserialize thread id

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Visualizer: Quality of life improvements throughout

- Decrease row size for more information onscreen
- Remove fudge factors in drawing logic
- Add comments to deserialization logic
- Fix Editor text scaling bug
- Early out for data culling to avoid erase_if call

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
4 years ago
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp c8c29b1aff
Enable warning MSVC 4296: 'operator': expression is always false 4 years ago
moudgils b2b6886338
Fixes asserts related to buffer allocation using null rhi (#3367)
Fixes GPU crashes when releasing Indirect draw and query related dx12 objects
Fixes imgui profiler related to viewing buffer allocations

Signed-off-by: moudgils <moudgils@amazon.com>
4 years ago
Esteban Papp a35464ca08 more fixes
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 036114a5a7 Merge branch 'development' into cmake/SPEC-2513_w4244
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
4 years ago
Jacob Hilliard e865ad5d23
Profiler: implement loading from saved captures (#3026)
* Profiler: implement loading from saved capture
Adds functionality for finding a saved capture on disk and then
deserializing it using rapidjson's built-in buffered stream reader. This
does require use of raw file pointers since saved captures can be
hundreds of megabytes.
Actually showing the data in the visualizer is TODO.
* Profiler: use heap buffer over stack buffer
* Profiler: move deserialization logic to ImGuiCpuProfiler

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
4 years ago
pappeste dcab2751de Atom
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 75c388b746 change conversions to static_cast
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Esteban Papp 90cad016de Gems/Atom
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
pappeste 38fd7f0013 fixing Atom
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
4 years ago
Steve Pham 83f6cb813a
Fix Non-Unity compile error with Atom Sample Viewer and the Atom Gem (#3119)
Signed-off-by: spham-amzn <spham@amazon.com>
4 years ago
Jacob Hilliard 016cfef6ca
Visualizer: fix empty rows being shown (#2881)
Fixes a bug with the visualizer where there would be empty rows shown,
e.g. threads without any profiling regions. This was especially
noticable when going from a high thread count sample (MultiThread) to a
low thread count sample, where most of the visualizer would be empty
lines. This adds a data culling step to remove the threads without any
remaining execution data + an early out so that all threads shown
onscreen must have some regions recorded.

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
4 years ago
Jacob Hilliard 7c5120b72f
[ATOM-16021] Initial continuous capture support (#2624)
* Profiler: Implement continuous capture internals

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: extend ProfileCaptureSystemComponent

Implements dumping of saved CPU profiling data to a local file, blocking
call.

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: Working IO thread for serialization

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: switch to AZ::JobFunction for IO

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: move to a ring buffer for storage

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: switch back to IO thread

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: add TODO

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Profiler: correct thread safety issues

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
4 years ago
Jacob Hilliard 6d345512c1
Visualizer: switch to erase_if to improve performance (#2779)
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
4 years ago
Jacob Hilliard 5a18b24651 Visualizer: use template functor over hardcoded lambdas
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard a271a85d6e Visualizer: postfix -> prefix increment
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard a064cedb59 Visualizer: fix clang build error
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard 11a001946f Visualizer: Implement total time + cleanup
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard bd00867fe6 Visualizer: Implement thread hovering tooltip
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard 487fc631ec Visualizer: Tabular view of function statistics
Current metrics are MTPC, max time, and invocations per frame. The
invocations per frame is buggy if switching between samples but I don't
know how to fix that in a context-agnostic way (editor vs ASV) - resetting
works for now.

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard d5a496751c Visualizer: Implement region search + highlight
Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Jacob Hilliard db8f78890f
[ATOM-16017] Implement frame time histogram in visualizer (#2378)
* Histogram: Basic working graph of frame times

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Histogram: Improve usability

Implements horizontal frame limit lines, limit-based coloring, and a
viewport indicator.

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>

* Histogram: Implement interactions

Signed-off-by: Jacob Hilliard <jhlliar@amazon.com>
5 years ago
Steve Pham 62356b811f
Non unity compile fixes (#2365)
* Add missing RTTI include to fix non-unity build error
* Add missing includes that were automatically added as part of unity builds

Signed-off-by: Steve Pham <spham@amazon.com>
5 years ago