c95acc41
Update directory structure of graphic test
- Move framework in framework directory
- Move scene in RenderPipeline/LowEndMobile directory
- Add RenderPipeline/HDRenderPipeline
7 年前
1eaf565f
Merge pull request #264 from Unity-Technologies/Add-graphic-test-for-HD
Add graphic test for hd
7 年前
9ba99a5b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
7 年前
54b6d8a9
Updated custom testframework build file to account for new path and to only allow iOS build on Mac OSX
7 年前
77b7d74b
Merge remote-tracking branch 'refs/remotes/origin/master' into Remove-lightloop-asset
7 年前
dee59c09
Merge branch 'master' into ssao-test
7 年前
df0c1521
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/PostProcessing
7 年前
6f3e7b0a
Refactored LD to Lightweight
7 年前
13e14f67
Merge branch 'master' into ssao-test
7 年前
dda281fd
Merge branch 'master' into classicDeferredMobile
7 年前
85744e59
Local merge
7 年前
d070d1b8
Merge branch 'master' into Branch_Batching2
7 年前
3ebe5f84
Fix test framework compilation after latest trunk merge
7 年前
4adbf45e
Merge branch 'master' into OnTileDeferred
7 年前
23202e49
merge in OnTileDeferredBranch after merging in master to it
7 年前
4fcf88bb
Merge branch 'master' into Branch_Batching2
# Conflicts:
# ProjectSettings/ProjectVersion.txt
7 年前
a04a82ab
Merge branch 'master'
7 年前
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
262e9a57
Move tests into common folder
7 年前
271fbdce
Fix path in TestFramework
7 年前
05ffcc95
Merge pull request #379 from Unity-Technologies/restructuring
Restructuring
7 年前
024a70fc
Merged master.
7 年前
e0e3492b
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
2cd62598
Update graphics test framework to work with new folder structure
7 年前
4898d174
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into volumetrics
7 年前
a2c2ce7f
Merge branch 'master' into LightweightPipeline
7 年前
a2e029a1
merge with master + a few samplegame fixes
7 年前
ce712ae5
Fixed tests and templates to account for LDR rendering.
7 年前
b72b35d7
Added MSAA support to the test framework.
7 年前
4bf2abf5
Merge branch 'LightweightPipeline'
7 年前
8f8eb990
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-shader-pass
7 年前
c62bfeca
Merged with master
7 年前
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
9464aaa0
Organize menu items
7 年前
9a371093
Merge pull request #556 from salvadorj/organize-menu-items
Organize menu items
7 年前
1a5590ab
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# TestbedPipelines/OnTileDeferredPipeline/OnTileDeferredRenderPipeline.cs
7 年前
f052451a
merged from master
7 年前
5224d3ba
Fixed issue in test framework that was incorrectly blending alpha. Fixed issue in specular of simple lighting shader.
7 年前
d1c74bcb
Merge branch 'master'
7 年前
45f497ea
Merge pull request #593 from Unity-Technologies/LightweightPipeline
Lightweight pipeline
7 年前
d31d3ab4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
18e0d6e8
Merge branch 'Unity-2017.3'
7 年前
7b797ff7
Merge branch 'master'
7 年前
85e38a3c
Merge branch 'master' into shader-include-paths-2
7 年前
fe773302
Merge master
7 年前
1308feb1
Merge branch 'feature/realtimeCubemap' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
8d13e04a
Add Playmode graphic tests
7 年前
b6423cf9
merge
7 年前
a9b5ae63
First working version of plyamode graphic test
7 年前
82ffcc9f
Add settings for building playmode graphic tests
7 年前
eb877135
Merge pull request #639 from Unity-Technologies/HDRP-GraphicTests
Hdrp graphic tests
7 年前
414e5846
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
7 年前
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
68425c93
Merge branch 'master' into prototype/decals
# Conflicts:
# SampleScenes/HDTest/GraphicTest/RealtimeCubemaps.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitData.hlsl
7 年前
da27429f
Do some tricks to have a separate hierarchy in testrunner for the different pipelines.
7 年前
3575217b
Fixes asked for PR
7 年前
81d62eb8
Merge branch 'master'
7 年前
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
86534aaf
Merge pull request #647 from Unity-Technologies/TestRunner-PipelineFilter
Separate hierarchy in testrunner for the different pipelines
7 年前
6f0b24c1
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
16235f08
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
c16681df
Merge branch 'master'
7 年前
1240cc88
Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code
7 年前
97ba53ba
Disable re-setting the renderPipeline for a graphic if it is already set.
Add "/Scenes" to the hd pipe test scenes search, to ignore the playmod test scene.
7 年前
10e23187
Merge branch 'master' into volume-improvements
7 年前
4ca37d7f
Merge pull request #679 from Unity-Technologies/TestRunner-SetRenderpipeOptimisation
Graphic TestRunner Optimisation
7 年前
b284a234
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
8a563a64
Modify graphic test to set the pipeline asset once for a batch of tests. Can gain time when running tests.
7 年前
a5aef4e0
Merge pull request #684 from Unity-Technologies/TestRunner-SetPipelineOnce
Set the pipeline asset once for a batch of tests.
7 年前
effdbb9c
Merge branch 'master'
7 年前
71f453af
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/GGXConvolution/RuntimeFilterIBL.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
657828b3
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-frameSettings
7 年前
7779e807
Merge branch 'master'
7 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
50a43207
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
db6f48d8
Merge branch 'master' into prototype/decals
# Conflicts:
# ScriptableRenderPipeline/Core/Editor/ShaderGenerator/CSharpToHLSL.cs
# ScriptableRenderPipeline/Core/Resources/EncodeBC6H.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalData.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Decal/DecalProperties.hlsl
7 年前
87c36d52
merged with master
7 年前
0c9c55a9
Merge in master, with lots of fixups
Git hates merges + moves/renames.
Main problems have to do with FrameSettings management, and shifting of stuff into the more responsible SubsurfaceScatteringManager
7 年前
ca0020dd
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/CommonSettings.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/HDRP_Test_Camera.prefab
7 年前
d5dfa0d9
Refactor the test framework to allow to run the tests in editor play mode :
- Add TestFrameworkPlayMode class
- Move common functions to TestFrameworkTools class
- Add a setting in SetupSceneforRenderPipelineTest to invoke custom actions before capturing
7 年前
4013d3fa
Merge pull request #775 from Unity-Technologies/HDRP-GraphicTests
Hdrp graphic tests
7 年前
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
a9de3b79
Move script files to Editor folders if needed
Some namespaces (e.g. NUnit) can't be used unless the script is inside an Editor folder.
This moves the minimum set of files to Editor folders, relative to the original file location.
There may be more files that should be re-arranged.
7 年前
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
7 年前
1017d3de
Merge pull request #776 from Unity-Technologies/fix-paths-from-pr775
Move script files to Editor folders if needed
7 年前
43f6d6eb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat
7 年前
468b92e2
Move back play mode testrunner script out of Editor Folder, and add compilation directives to avoir build failures.
Fix script GUID in LT and HD test scenes.
7 年前
b8348971
Merge pull request #781 from Unity-Technologies/PlayMode_Tests_and_Build_Fix
Fix Fix for playmode tests (no more build failure)
7 年前
c09a6280
Create test assembly deffinition files, to avoid to have to "enable playmode test for all assemblies"
7 年前
4b33a1b6
Merge branch 'master' into lw-gc-optim
7 年前
1588a9a8
Merge pull request #784 from Unity-Technologies/Test_Assemblies
Create test assembly deffinition files
7 年前
8324b5e9
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-light-unity-support
7 年前
4a36daf4
Add GBuffer debug for debug view controller.
Filter out Play Modes tests in editor test list.
Remove unecessary vars from scene setup
Update MotionVector test template because of optimisation (and frame offset)
7 年前
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
4008da43
Fix TestFrameworkTools (relative scenes path issue)
7 年前
472cdbf4
Fix scenes list handling for playmode tests
Fix non deterministic behaviour of playmode tests
7 年前
84a0053a
Merge pull request #789 from Unity-Technologies/HDRP-GraphicTests
Hdrp graphic tests
7 年前
c36be30a
Revert "Hdrp graphic tests"
7 年前
fa3e734e
Merge pull request #790 from Unity-Technologies/revert-789-HDRP-GraphicTests
Revert "Hdrp graphic tests"
7 年前
9909bf32
Revert "Revert "Hdrp graphic tests""
7 年前
02a16451
Merge pull request #792 from Unity-Technologies/revert-790-revert-789-HDRP-GraphicTests
Revert "Revert "Hdrp graphic tests""
7 年前
d1a57b2a
Revert "Revert "Revert "Hdrp graphic tests"""
7 年前
b4149381
Merge pull request #793 from Unity-Technologies/revert-792-revert-790-revert-789-HDRP-GraphicTests
Revert "Revert "Revert "Hdrp graphic tests"""
7 年前
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
4919b7ad
Merge branch 'master' into Branch_ScreenSpaceShadows
# Conflicts:
# ScriptableRenderPipeline/Core/ShaderLibrary/Random.hlsl
# ScriptableRenderPipeline/Core/Shadow/AdditionalShadowData.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDStringConstants.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.Styles.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/Editor/HDLightEditor.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/DeferredDirectionalShadow.compute
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderVariablesFunctions.hlsl
7 年前
77f9f167
Merge branch 'master'
7 年前
3ccf74cc
merged from master
7 年前
10174353
Merge pull request #800 from Unity-Technologies/FixFix_TestFrameworkTools
Fix fix test framework tools
7 年前
a79042e5
Merge branch 'master' into pr/798
7 年前
7d2031ec
Merge branch 'master'
7 年前
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
86df6636
Merge master
7 年前
4172199d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta
7 年前
074f76bb
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher
7 年前
1a984f4b
Bundle of warning fixes.
7 年前
a85fe8fe
Merge pull request #826 from Unity-Technologies/Branch_WarningFix
Bundle of warning fixes.
7 年前
c51ce48c
Merged master
7 年前
5f6876d6
Merge branch 'master' into feature/PlanarReflection
7 年前
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
cf25c602
Merge master
7 年前
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
585366d1
Correct pipeline assets not beeing set up correctly after running the tests.
Also, backup and restore current opened scenes after running any test.
7 年前
c26fa8d3
Merge pull request #857 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
c43a2771
Merge remote-tracking branch 'refs/remotes/origin/master' into Fix-flip-issue
7 年前
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
d6743fba
Merge branch 'master' into feature/PlanarReflection
7 年前
3023e8c8
Merge Screen Space Shadows
7 年前
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
19029ddd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/RenderPipelineSettingsUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/RenderLoopSettings/SerializedRenderPipelineSettings.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipeline/RenderPipelineSettings.cs
7 年前
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
bba59d17
Working (still some errors to fix) test result window.
7 年前
1728fbeb
Merge pull request #889 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
672c909b
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta
# Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta
7 年前
18cd3660
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-Menu-location-and-label
7 年前
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
6 年前
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
65aa2c2b
Modifi test framework to test template image against multiple render pipelines per scene (HDRP parity)
6 年前
da4312b1
Modify test framework to be able to use multiple render pipeline assets for a single test, in order to test parity of features.
Modified LWRP testscenes accordingly.
6 年前
f5287a0f
Merge pull request #906 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
6 年前
78ba9e5b
Merge master
6 年前
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
f8b82f37
Move animated cookie scene to play mode tests
Update Light on tesselcation scene (shadows in reflection probes are fixed now)
6 年前
fe34a794
Fix reflection probe layout in test 2401
Try to accelerate tests by greatly reducing the number of wait frames. Seems stable.
6 年前
6a07965f
Merge pull request #928 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
6 年前
44fabb65
Merge branch 'master' into hdrp-xr-initial
6 年前
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
6 年前
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
6 年前
b6b37ddb
Add possibility to have comment in tests listed in TestRunner
6 年前
d73b4d26
Merge pull request #932 from Unity-Technologies/HDRP_GraphicTests
Add possibility to have comment in tests listed in TestRunner
6 年前
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
6 年前
5e5e46c8
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
6 年前
619cd52e
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
6 年前
35560656
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
75b17fab
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/Decal.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/DecalUtilities.hlsl
6 年前
070349c8
Merge branch 'master'
6 年前
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
6 年前
aeefe219
Merge branch 'master2' into LW-LightOptimizations
6 年前
7427bb14
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
6 年前
e768893e
Merge branch 'master'
6 年前
0ac4d650
Make the tests more sensitive (tile average comparison instead of full image average).
Update templates.
Compare with Lab colorspace
6 年前
4bbe5773
Merge pull request #951 from Unity-Technologies/HDRP_GraphicTests
Big graphic test framework update.
6 年前
2e77d205
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
6 年前
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
04b933d9
merged with master
6 年前
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
6 年前
2d48e00b
Merge branch 'master'
6 年前
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
4b17c74c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScriptableCulling
# Conflicts:
# SampleScenes/HDTest/Material/HDRenderLoopMaterials/Grid_10_5.mat
# SampleScenes/HDTest/Prefabs/Block_0.3x6.prefab
# SampleScenes/HDTest/Prefabs/Block_10x0.15.prefab
# SampleScenes/HDTest/Prefabs/Block_10x5.prefab
# SampleScenes/HDTest/Prefabs/Block_1x1.prefab
# SampleScenes/HDTest/Prefabs/Block_50x300.prefab
# ScriptableRenderPipeline/Core/CoreRP/Camera/CameraSwitcher.cs
6 年前
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
6 年前
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
6 年前
8cc0d941
Merge SRP 2018.1
6 年前
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
6 年前
d1dfdb4e
Merge branch 'master' into feature/ScreenSpaceProjection
# Conflicts:
# SampleScenes/HDTest/PlanarReflectionTests.unity
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/LightingDebugPanel.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
6 年前
4838fe60
Fix path search in test tool framework
6 年前
a2790a45
Merge pull request #1159 from Unity-Technologies/feature/RefractionModes
Screen Space Refraction Projection Model
6 年前
8d663ac4
Merge upstream/master
6 年前
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
6 年前
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
256e6c9c
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
6 年前
533beaae
Merge branch 'master' into LWRP
6 年前
fafb59af
Run code formatter.
6 年前
4d7f78f1
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/BuildPlayer/HDRPVariantStripper.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
6 年前
sebastienlagarde
GitHub
Julien Ignace
Felipe Lira
Sebastien Lagarde
Arnaud Carre
Filip Iliescu
David Rogers
Evgenii Golubev
Peter Bay Bastian
Tim Cooper
Peter Andreasen
Salvador Jacobi
Paul Melamed
Frédéric Vauchelles
Remy
Robert Srinivasiah
Raymond Graham
runes
lyndon homewood
Thomas
John
uygar
John Parsaie