birkeh/o3de
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
8,174 Commits 3 Branches 3 Tags
45926d0dbddc3bb8a294bb407cb07ade47bdd37b
Commit Graph

422 Commits

Author SHA1 Message Date
santorac 6b23e07af4 Changed MaterialConverterBus GetMaterialTypePath() to return a string instead of char* 
Minor code cleanup.

Signed-off-by: santorac <55155825+santorac@users.noreply.github.com>
 2021-08-20 17:22:11 -07:00
Esteban Papp b96b99363c Merge branch 'development' into cmake/linux_fix_warn_unused 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 14:51:35 -07:00
Esteban Papp c8c29b1aff Enable warning MSVC 4296: 'operator': expression is always false 2021-08-20 13:42:19 -07:00
Esteban Papp 8bc9ed3d01 removing some rad leftovers (#3366) 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 13:39:51 -07:00
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>
 2021-08-20 13:31:35 -07:00
Kyle Birnbaum 2b1f4c2fc0 Merge branch 'development' into ExposeLodControls 2021-08-20 12:45:00 -07:00
Kyle B b53a085700 Merge branch 'development' into ExposeLodControls 2021-08-20 12:14:59 -07:00
Esteban Papp b3023242d0 Merge branch 'development' into cmake/win_fix_warn_4296 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 11:18:43 -07:00
Esteban Papp a35464ca08 more fixes 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-20 10:09:44 -07:00
Esteban Papp 62a0041245 enable warning 4296: 'operator': expression is always false 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-19 16:16:28 -07:00
Judy Ng f41438770c add shaderoptiongroup natvis (#3315) 
Signed-off-by: Judy Ng <njud@amazon.com>
 2021-08-19 17:09:01 -05:00
santorac 079e018e8e Merge remote-tracking branch 'upstream/development' into Atom/santorac/OptionalSceneApiMaterialConversion3 2021-08-19 10:37:01 -07:00
Esteban Papp 2521ad2301 Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Gems/Atom/RHI/DX12/Code/Source/RHI/Device.cpp
 2021-08-19 10:12:22 -07:00
jiaweig 6766d10d1b ATOM-13883 [RHI][Core] - Moving RHI init settings to the new settings registry system (#3086) 
* Moved PlatformLimits to setreg. Removed Device PostInit. Some clean up.

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

* Move setreg loading the PlatformLimitsDescriptor super class.

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

* Apply same implementation for fake device used in unit tests

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

* Add implementation for Null renderer. Swap order for register RHI interface in initialization.

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

* Move back setreg from PlatfromLimitsDescriptor to Device, due to Linux dependency issue.

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

* Changed the function to take in RHI backend name

Signed-off-by: jiaweig <jiaweig@amazon.com>
 2021-08-19 10:08:10 -07:00
Esteban Papp f8e99cd7dd Merge branch 'development' into cmake/SPEC-2513_w4244 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>

# Conflicts:
#	Code/Editor/CryEditDoc.cpp
#	Code/Framework/AzToolsFramework/AzToolsFramework/Input/QtEventToAzInputManager.cpp
#	Gems/Atom/Feature/Common/Code/Source/PostProcessing/BlendColorGradingLutsPass.cpp
#	Gems/PhysXDebug/Code/Source/SystemComponent.cpp
 2021-08-19 08:53:41 -07:00
Jeremy Ong a5f072f7a9 Remove statistics profiler 
Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:10 -06:00
Jeremy Ong df9b4d4a2f Deprecate profiler categories based on global enum 
(to be supplanted by registered budgets in the future)

Signed-off-by: Jeremy Ong <jcong@amazon.com>
 2021-08-18 17:33:09 -06:00
Ken Pruiksma 90845313fb Overhaul of LookModification (#3282) 
* Fixed log2 shaper equations. Added bspline sampling for lut. Added options for custom log2 or linear lut with custom exposure ranges.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Added support for PQ shaper. Added shader option & cvar for lut sampling quality. Fixed issues in the blend lut shader that were causing considerable quality loss. No longer always changing to the log2 1000 nit shaper when blending luts - if the source luts all use the same shaper, keep using that shaper in the blended lut.

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Fixed an integer -> float

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>

* Minor PR reveiw updates

Signed-off-by: Ken Pruiksma <pruiksma@amazon.com>
 2021-08-18 16:59:34 -05:00
chcurran 1d1cea34dd Undo artifacts for JsonUtils sojourn into AzToolsFramework 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-18 11:58:24 -07:00
chcurran de9e991ccc merge development 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 15:37:30 -07:00
chcurran 88121f3bb4 move JsonUtils to AzCore 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-17 14:06:24 -07:00
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
 2021-08-17 12:10:46 -07:00
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>
 2021-08-17 11:33:13 -07:00
AMZN-stankowi b98a67e836 Better error reporting on mixing skinned and unskinned meshes. (#3158) 
Signed-off-by: stankowi <4838196+AMZN-stankowi@users.noreply.github.com>
 2021-08-17 08:21:40 -07:00
Esteban Papp 1d4c53a777 More fixes for Gems 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:42:03 -07:00
pappeste dcab2751de Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:39:57 -07:00
Esteban Papp 75c388b746 change conversions to static_cast 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:43 -07:00
Esteban Papp 90cad016de Gems/Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:05:31 -07:00
pappeste 38fd7f0013 fixing Atom 
Signed-off-by: Esteban Papp <81431996+amznestebanpapp@users.noreply.github.com>
 2021-08-16 16:03:36 -07:00
chcurran 5044204839 Move JsonUtils.h for support of SC serialization 
Signed-off-by: chcurran <82187351+carlitosan@users.noreply.github.com>
 2021-08-13 21:53:20 -07:00
michabr cd5081a7c3 Fix byte alignment issue for index/vertex buffers (#3110) 
* Fix byte alignment issue for index/vertex buffers
* Remove default alignment value when getting dynamic buffer

Signed-off-by: abrmich <abrmich@amazon.com>
 2021-08-13 13:31:46 -07:00
antonmic 7d4022fbdf Merge pull request #3035 from aws-lumberyard-dev/Atom/antonmic/PassBuilder 
Changing pass builder to declare job dependencies on referenced .shader files and consequently removing the critical flag from the shader builder.
 2021-08-13 11:50:51 -07:00
antonmic 706333466e Addressing PR feedback and making PassBuilder error if referenced shader isn't found 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-12 23:58:51 -07:00
moudgils c2b8542bbd Support for refresh rate and sync interval (#2989) 
* Add support for querying the refresh rate and sync interval
 2021-08-12 12:07:46 -07:00
Kyle B 0c05c9f204 [not working] Made lod selection more generic for further work 
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
 2021-08-11 15:49:50 -07:00
dmcdiarmid-ly e10e62b399 Merge pull request #2863 from aws-lumberyard-dev/Atom/dmcdiar/ATOM-15995 
Add callback mechanism for GPU resource release
 2021-08-11 13:05:27 -07:00
antonmic 39d56a8834 Removing product dependency check from pass builder test since shaders references are now registered as a job dependency and not a product dependency 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-11 10:45:48 -07:00
antonmic 193fa3c918 Merge pull request #2584 from aws-lumberyard-dev/Atom/antonmic/SrgDebugImprovements 
Shader resource group debug improvements
 2021-08-11 10:37:36 -07:00
Benjamin Jillich 5c90bc0d58 Skip blend shapes that influence multiple meshes (#3009) 
Signed-off-by: Benjamin Jillich <jillich@amazon.com>
 2021-08-11 09:45:47 +02:00
antonmic adf7a34ef5 Got PassBuilder shader dependency working and removed critical flag from shader builder 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-10 23:07:23 -07:00
Artur K 4cee263033 Minimal TypeInfo header/reduce std interdependencies. (#2688) 
* Minimal TypeInfo header/reduce std interdependencies.

TypeInfoSimple.h is a small header that can replace the use of
TypeInfo.h in some cases.

Signed-off-by: Nemerle <nemerle5+git@gmail.com>

* Windows build fixed

Removed algorithm.h from string_view.h

smoke-test passed

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

* Resotore dynamic_pointer_cast in intrusive_ptr

Requested by reviewer.

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

* Fix CI build

string.h - missed alogorithm.h, since it was removed from string_view
NodeWrapper.h - missing smart_ptr.h

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

Co-authored-by: Nemerle <nemerle5+git@gmail.com>
 2021-08-10 19:07:01 -05:00
antonmic 5472d6768e Minor improvements 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-10 12:48:26 -07:00
dmcdiar 327477cace Merge branch 'development' into Atom/dmcdiar/ATOM-15995 2021-08-10 11:51:04 -07:00
antonmic 43ae25b49b fixed compiler loss of precision warning 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-10 10:00:42 -07:00
antonmic 8d7d560d9d Merge branch 'dev' into Atom/antonmic/SrgDebugImprovements 2021-08-09 23:47:40 -07:00
antonmic 4beb66c9ca Making pass files declare dependency on shader files (part 01) 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-08 23:37:54 -07:00
antonmic 5f1e973b3f Removing condition from View SRG compilation 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-08 23:34:09 -07:00
antonmic 64cff38f82 Addressing PR feedback and fixed a small issue with the draw item count display 
Signed-off-by: antonmic <56370189+antonmic@users.noreply.github.com>
 2021-08-08 16:46:42 -07:00
Kyle B 51271fa15b Created group for Lod component data 
Signed-off-by: Kyle B <kylebirnbaum@gmail.com>
 2021-08-06 16:57:00 -07:00
Esteban Papp 19d79f1559 Merge branch 'development' into cmake/SPEC-2513_w4267 2021-08-05 14:57:24 -07:00