Doug McDiarmid e769219bac Merge branch 'development' into Atom/dmcdiar/ATOM-5702 ...

# Conflicts:
#	Gems/Atom/RPI/Code/Source/RPI.Public/Shader/Shader.cpp
#	Gems/Atom/RPI/Code/Source/RPI.Reflect/Shader/ShaderAsset.cpp

2021-06-21 15:26:20 -07:00

..

Metrics

Initial commit

2021-03-08 14:30:57 -08:00

Shader.cpp

Merge branch 'development' into Atom/dmcdiar/ATOM-5702

2021-06-21 15:26:20 -07:00

ShaderReloadDebugTracker.cpp

Initial commit

2021-03-08 14:30:57 -08:00

ShaderResourceGroup.cpp

NoMSAA supervariant support

2021-06-18 16:39:32 -07:00

ShaderResourceGroupPool.cpp

[ATOM-15472] Shader Build Pipeline: Remove Deprecated Files And Funct… (#1079)

2021-06-11 07:48:23 -05:00

ShaderSystem.cpp

NoMSAA supervariant support

2021-06-18 16:39:32 -07:00

ShaderVariant.cpp

Restore connections in ShaderVariant::Init

2021-06-18 22:03:39 -07:00

ShaderVariantAsyncLoader.cpp

Merge remote-tracking branch 'upstream/stabilization/2106' into nvsickle/MergeStabilizationJun18

2021-06-18 13:25:53 -07:00