Arnaud Carre
f9bee4e4
prepare HD shaders for new fast batcher compatibility
8 年前
Arnaud Carre
24796c7d
add NewBatcherBench2 scene with dynamic move & shadows. NewBatcherBench1 now use static batching to test new batcher support
8 年前
Arnaud Carre
a1f0c0eb
fix additional lightdata stuff in NewBatcherBench test scenes (for shadows)
8 年前
GitHub
e608702b
Merge pull request #257 from Unity-Technologies/Branch_Batching2
Branch batching2
8 年前
sebastienlagarde
0e9f5de7
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-shadow
8 年前
Sebastien Lagarde
89a7c17b
Clenaup of folders, renaming and warning fix (see details in description)
- Rename "Common" folder "Core" folder
- Move fptl specific code from common to fptl (skyhelper, shaderbase.h)
- Move hdrp specific code from common to hdrp (resource
blitcubemap.shader)
- Remove "tutorial" on basicRenderPipeline folder name
- Update path name in shader for shadow include
- Fix misc warning in shaders
8 年前
GitHub
c185048e
Merge pull request #259 from Unity-Technologies/Shadow-debug-and-cleanup
Cleanup SRP project
8 年前
Filip Iliescu
8eef028b
merged master
8 年前
Arnaud Carre
5b313e79
add some stats to mini-profiler
8 年前
Arnaud Carre
1b8ffc41
adding new skinned mesh scene
8 年前
Arnaud Carre
0e118bb0
change skinMesh scene with spiders
7 年前
Arnaud Carre
5b684631
new batcher test scenes updated
7 年前
Arnaud Carre
fb1f6f8f
update some new batcher test scenes
7 年前
Peter Bay Bastian
67038b7a
Move Assets/Textures/ to Assets/TestScenes/Common/Textures/
7 年前
GitHub
05ffcc95
Merge pull request #379 from Unity-Technologies/restructuring
Restructuring
7 年前
Felipe Lira
024a70fc
Merged master.
7 年前
Tim Cooper
e0e3492b
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Peter Bay Bastian
a4ea9ff8
Merge branch 'master' into prepare-filtering
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Frédéric Vauchelles
8ad5930b
[BC6H] Added test scene
7 年前
Frédéric Vauchelles
6e5f9e7e
[BC6H] Renamed C# BC6H to EncodeBC6H
7 年前
GitHub
8e4cb10b
Merge pull request #600 from Unity-Technologies/feature/BC6HOnGPU
BC6H Compression on GPU
7 年前
Evgenii Golubev
6be2053b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Frédéric Vauchelles
fe773302
Merge master
7 年前
Remy
39c80121
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Julien Ignace
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 年前
Frédéric Vauchelles
b3297fb6
[Cubemap] Added BC6H support for ReflectionProbeCache
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
GitHub
56dbf3ce
Merge pull request #614 from Unity-Technologies/feature/realtimeCubemapBC6H
BC6H Support for ReflectionProbeCache
7 年前
sebastienlagarde
e89a930f
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
e45df6b6
Merge branch 'master' into LightweightPipeline
7 年前
Paul Melamed
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 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
sebastienlagarde
2c9bfb4e
HDRenderPipeline: fix all material in current project
7 年前
GitHub
fc5778fa
Merge pull request #655 from Unity-Technologies/Fix-all-material-in-project
HDRenderPipeline: fix all material in current project
7 年前
sebastienlagarde
04b2dec6
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals
7 年前
Julien Ignace
1ce75e59
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Evgenii Golubev
7106bb0a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
sebastienlagarde
9c34dc78
Fixed few .SampleLevel call not using the abstractoin API
7 年前
GitHub
31cc4924
Merge pull request #675 from Unity-Technologies/fixed-sampleLevel-call
Fixed few .SampleLevel call not using the abstractoin API
7 年前
Remy
a01cf7d4
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Sebastien Lagarde
1240cc88
Merge remote-tracking branch 'refs/remotes/origin/master' into Clean-SSS-code
7 年前
sebastienlagarde
d2b483b9
HDRenderPipeline: Revert change of CubemapColorMap test scene
7 年前
Remy
bb73d4c6
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
GitHub
10e23187
Merge branch 'master' into volume-improvements
7 年前
Evgenii Golubev
effdbb9c
Merge branch 'master'
7 年前
Julien Ignace
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 年前
Evgenii Golubev
7779e807
Merge branch 'master'
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Thomas
a62d770c
Added two animated sample scenes for testing
7 年前
GitHub
51d13b32
Merge pull request #698 from Unity-Technologies/anim-tests-hd
Added two animated sample scenes
7 年前
runes
364ad2cc
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Paul Melamed
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 年前
Evgenii Golubev
2e30e761
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Julien Ignace
65bd8e1d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
Frédéric Vauchelles
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Robert Srinivasiah
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 年前
Remy
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 年前
Felipe Lira
c6543428
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances.meta
# Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Assets/CommonAssets/Textures/ConvertedSubstances/Challenge-Brick.meta
7 年前
Mike Wuetherick
767eac9b
Merge branch 'LightweightPipeline' into projects/TheLastStand
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
01b7d081
HDRenderPipeline: Update all materils keyword in scene and project
7 年前
Raymond Graham
d1c64b56
Merge branch 'master' into gpuInstancingSupport
7 年前
Julien Ignace
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 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Arnaud Carre
4bef6509
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Remy
3b815534
Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs
# Te...
7 年前
Evgenii Golubev
7d2031ec
Merge branch 'master'
7 年前
Paul Melamed
6deb71dc
Merge branch 'master' into prototype/decals_drawinstance
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderVariables.hlsl
7 年前
Frédéric Vauchelles
86df6636
Merge master
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
Sebastien Lagarde
a28733e8
HDRenderPipeline: Update all materials
7 年前
Remy
2136ed15
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Tim Cooper
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
John
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
John
0bfdddfc
Merge Screen Shadows
7 年前
Julien Ignace
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 年前
sebastienlagarde
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Frédéric Vauchelles
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 年前
Sebastien Lagarde
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
7 年前
sebastienlagarde
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Arnaud Carre
b5aa0bdd
new SRP batcher scene test ( HD + LT )
7 年前
Arnaud Carre
69a3f7fb
new test scene with animated skin mesh
7 年前
sebastienlagarde
5f14b489
Update all materials with Last PR
7 年前
GitHub
ce027b15
Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass
Update all material for PR 946
7 年前
sebastienlagarde
44c4a197
Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence
7 年前
Evgenii Golubev
e768893e
Merge branch 'master'
7 年前
Remy
d56ea57d
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Robert Srinivasiah
a3ddcd05
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
sebastienlagarde
2c61701c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前