Felipe Lira
53105986
Added lightweight unlit and its shader GUI
7 年前
Julien Ignace
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
7 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
7 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
7 年前
Felipe Lira
87ac03cd
Added LightweightPipeline shader GUI. Updated PBR material with the new keywords.
7 年前
Felipe Lira
55afe234
Fixed MettalicGloss map not being applied.
7 年前
Felipe Lira
2174bed4
Added microfacet BRDF model. Some changes to keywords in the LightweightStandard shader GUI.
7 年前
Felipe Lira
602d1a7c
Fixed a normalization issue. Fixed keywords not being properly set in SpecularSetup.
7 年前
Felipe Lira
cad81442
Disabled Bump map scale. Lightweight pipeline doesn't support it.
7 年前
Felipe Lira
6076bb69
Fixed up LightweightStandardShaderGUI to only support BakedEmissive lightmap mode.
7 年前
Felipe Lira
c9ed078e
Added check to propertly assign _MetallicSpecGlossMap when upgrading from Standard/StandardSpecular.
7 年前
Felipe Lira
4bf2abf5
Merge branch 'LightweightPipeline'
7 年前
Felipe Lira
f4fc9498
Updated shader and materials to use same metallic/spec gloss map and keywords as standard. This will allow substance workflow to work in lightweight.
7 年前
sebastienlagarde
8f8eb990
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-shader-pass
7 年前
Peter Andreasen
c62bfeca
Merged with master
7 年前
Felipe Lira
9ea83a56
Added Occlusion keyword. Updated materials. More refactor on the shader.
7 年前
Felipe Lira
0afc0404
Fixed emission property on SimpleLightingShader. Removed Env mapping support for consistency with old legacy shader library.
7 年前
Felipe Lira
f01f666d
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
Felipe Lira
1f302ce7
Name refactor on ShaderGUIs
7 年前
GitHub
0742fb7a
Merge pull request #413 from Unity-Technologies/Unity-2017.3
Merge Unity 2017.3 to master
7 年前
Felipe Lira
d1cf8765
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
Felipe Lira
0c75b7cd
Fixed emission in LightweightSimpleLighting shader. Fixed shader inspectors.
7 年前
GitHub
a82f6ffc
Merge pull request #421 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
8b79450a
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
Evgenii Golubev
7a094ed8
Merge branch 'Unity-2017.3'
7 年前
Julien Ignace
825bfd84
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DepthPrepass
7 年前
GitHub
5710175b
Merge pull request #424 from Unity-Technologies/Detail-map-tiling-depends-on-base-tiling
Detail map tiling depends on base tiling
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Thomas
076b0d65
Cleaned up unused usings
7 年前
GitHub
89072748
Merge pull request #449 from Unity-Technologies/refactor-episode-2
Refactoring: Episode 2 - The Editor Strikes Back
7 年前
sebastienlagarde
71713559
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3
7 年前
GitHub
f49bc2d1
Merge pull request #450 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Peter Andreasen
2ef7d649
merged with master
7 年前
Thomas
1763810c
Removed a few annoying warnings
7 年前
GitHub
720185a2
Merge pull request #451 from Unity-Technologies/refactor-episode-3
Refactoring: Episode 3 - The GC Apocalypse
7 年前
sebastienlagarde
0e87ca3f
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Distortion-cleanup-and-transparent-depth-pass
7 年前
Sebastien Lagarde
f62941c5
Merge branch 'Unity-2017.3' into Add-Per-Pixel-scale
7 年前
Evgenii Golubev
8d403196
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Evgenii Golubev
ea93b8f4
Merge branch 'Add-Per-Pixel-scale' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Felipe Lira
5f970d63
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Thomas
3d4686f1
Full SSS refactor
7 年前
GitHub
1b740960
Merge pull request #462 from Unity-Technologies/sss-refactor
Full SSS refactor
7 年前
sebastienlagarde
62435a94
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Update-detail-texture-blend-formula
7 年前
sebastienlagarde
3946f7cd
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Add-Per-Pixel-scale
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Editor/LitUI.cs
7 年前
sebastienlagarde
3305fbf3
Merge remote-tracking branch 'refs/remotes/origin/Add-Per-Pixel-scale' into Add-Per-Pixel-Scale-Seb-Test
7 年前
Evgenii Golubev
86fe9ae4
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
GitHub
6213cc0b
Merge pull request #470 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
cdc50657
Merge branch 'Unity-2017.3' into LightweightPipeline
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Peter Andreasen
e2332032
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
1e8876bf
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_FogAndProceduralSky
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/Material/Unlit/Editor/BaseUnlitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/ShaderPass/ShaderPassForwardUnlit.hlsl
7 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Felipe Lira
28ba8394
Removed _METALLIC_SETUP dependency. Now if _SPECULAR_SETUP is not defined MetallicSetup is used.
7 年前
Felipe Lira
ced47738
Added standard particle unlit. Created Particles ShaderGUI based on standard GUI. Removed distortion.
7 年前
Felipe Lira
c06f7217
Added support to bumpmap scale.
7 年前
Felipe Lira
8f6a326d
Removed Attenuation texture dependency due to precision issues with an alpha8. Optimized attenuation function to use 1 MAD instruction for the smooth factor.
7 年前
Felipe Lira
04829cba
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
GitHub
62808466
Merge pull request #585 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
d1c74bcb
Merge branch 'master'
7 年前
Julien Ignace
0a60dd2a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
Paul Melamed
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 年前
Peter Andreasen
5d36f104
Merged master
7 年前
Felipe Lira
f8a9d47a
Updated inspectors to 2018.1 and remove pipeline warnings.
7 年前
Felipe Lira
2387e5a5
Added GI to unlit standard shader.
7 年前
Felipe Lira
c62e8861
Refactored upgraders. Added Terrain and Particles upgraders.
7 年前
sebastienlagarde
f142c657
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
7 年前
Julien Ignace
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
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 年前
Felipe Lira
fa504521
Runned auto format tool.
7 年前
sebastienlagarde
c9ee9e33
Merge remote-tracking branch 'refs/remotes/origin/master' into add-xbone-one-support
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
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 年前
Raymond Graham
1118c956
Merge branch 'master' into motionVectorSupport
7 年前
Peter Andreasen
87c36d52
merged with master
7 年前
Felipe Lira
bc1c94ba
Upgraded Particles to SRP shader library.
7 年前
Felipe Lira
39035ffa
Merge branch 'LW-StandardParticlesUpgrade'
7 年前
Sebastien Lagarde
61c2e24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
7 年前
Evgenii Golubev
b8684ef4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Sebastien Lagarde
f97342c5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug
7 年前
lyndon homewood
ef4b0aa9
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
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 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
Raymond Graham
1e5e8a8a
GPU instancing in Lightweight renderpipeline
7 年前
GitHub
d48bc884
Merge pull request #807 from Unity-Technologies/LightweightGpuInstancing
GPU instancing in Lightweight renderpipeline
7 年前
Sebastien Lagarde
27c0d277
Merge remote-tracking branch 'refs/remotes/origin/master' into Replace-all-ToggleOff-by-ToggleUI--2018.1.b4-feature]
7 年前
Remy
afb74a48
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
Sebastien Lagarde
5705de92
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Paul Melamed
c5fce3e3
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Frédéric Vauchelles
ca10cd2f
Merge
7 年前
Felipe Lira
c51ce48c
Merged master
7 年前
John
cf25c602
Merge master
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
John
e5aff3eb
Initial integration of diffusion profile settings to sss
7 年前
John
1f75feea
Diffusion profile integration
7 年前
Tim Cooper
11121e37
LW: Fixes to shadow caster / depth passes for shadows.
7 年前
GitHub
c73b5e81
Merge pull request #961 from Unity-Technologies/LT-ShadowFixes
LW: Fixes to shadow caster / depth passes for shadows.
7 年前
Robert Srinivasiah
736da156
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
7 年前
Peter Andreasen
04b933d9
merged with master
7 年前
sebastienlagarde
e347d974
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
7 年前
Paul Melamed
429be124
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
7 年前
Thomas
44dd9f42
Merge branch 'master' into debug-menu-refactor
7 年前
Evgenii Golubev
2d48e00b
Merge branch 'master'
7 年前
Evgenii Golubev
3ad3c7d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Julien Ignace
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
7 年前
Remy
2001df3c
Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade
7 年前
sebastienlagarde
8d0fc95d
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
Matt Dean
07ca5f11
Upgrade Lightweight shaders and UI to closer match HD and Shader Graph
- Upgrades to Standard, Simple Standard and Unlit
- Split Rendering Mode into Surface Type and Blending Mode
- Add premultiply option to Simple Standard
- Make Alpha Clip Orthogonal
- Add two sided toggle
- Add Additive and Multiply blend modes
- Rename all blend modes to match HD and SG
- Rename Alpha Cutoff to Clip Threshold
- Remove unused "_ALPHABLEND" keyword
- Split premultiply and clip keywords
- Update material upgrader to reflect changes
- Various shader GUI fixes
Keywords: Adds 1 to Simple, Removes 1 from Unlit, PBR stays the same
7 年前
Tim Cooper
7394c13b
Upgrade Lightweight shaders and UI to closer match HD and Shader Graph
- Upgrades to Standard, Simple Standard and Unlit
- Split Rendering Mode into Surface Type and Blending Mode
- Add premultiply option to Simple Standard
- Make Alpha Clip Orthogonal
- Add two sided toggle
- Add Additive and Multiply blend modes
- Rename all blend modes to match HD and SG
- Rename Alpha Cutoff to Clip Threshold
- Remove unused "_ALPHABLEND" keyword
- Split premultiply and clip keywords
- Update material upgrader to reflect changes
- Various shader GUI fixes
Keywords: Adds 1 to Simple, Removes 1 from Unlit, PBR stays the same
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
7 年前
GitHub
2571ef70
Merge pull request #983 from Kink3d/master
Upgrade Lightweight shaders and UI to closer match HD and Shader Graph
7 年前
Joel de Vahl
56f21e1e
Merge remote-tracking branch 'origin/master' into LW-MaterialUpgrades
7 年前
Remy
50623c84
Merge remote-tracking branch 'origin/master' into HDRP_MaterialUpgrader
7 年前
Robert Srinivasiah
7733d48a
Merge remote-tracking branch 'origin/master' into hdrp-xr-bigtile
7 年前
Frédéric Vauchelles
fd3d298d
Merge branch 'master' into feature/ReflectionProbeBaking
7 年前
Paul Melamed
07ab7b09
Merge branch 'master' into decals/api_change
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
Evgenii Golubev
720c8a19
Merge branch 'master'
7 年前
Evgenii Golubev
dd8b51a8
Merge branch 'master'
7 年前
Felipe Lira
ca3977fa
Fixed glossiness keyword/alpha issue.
7 年前
GitHub
4c1e5957
Merge pull request #1087 from Unity-Technologies/lw/perf-regression-fix
Lw/perf regression fix
7 年前
Felipe Lira
049fa5ed
Merge branch 'master' into lw/shadow-optimization
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Frédéric Vauchelles
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
7 年前
Remy
da27105b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
John Parsaie
b65915e1
Refactor transmittance from light space.
7 年前
John Parsaie
ec03c7ab
Hair shadows opt-out for alpha blend
7 年前
John Parsaie
48229436
Kajiya Kay Hair
7 年前
Felipe Lira
1406ea59
Fixed glossiness keyword/alpha issue.
7 年前
GitHub
4b7f8519
Merge pull request #1088 from Unity-Technologies/backport/1087-perf-regression-fix
Backport/1087 perf regression fix
7 年前
Evgenii Golubev
1d711357
Merge 'upstream/master'
7 年前
Raymond Graham
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
Matt Dean
f98f82d0
Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass
7 年前
Felipe Lira
ec57c2a7
Moved common properties to LightweightShaderGUI. Added alpha premultiply to unlit.
6 年前
Felipe Lira
45ee32a0
Fixed null reference on bump properties in unlit particles UI.
6 年前
Felipe Lira
fd75f28f
Moved common properties to LightweightShaderGUI. Added alpha premultiply to unlit.
6 年前
Felipe Lira
51d1e44b
Moved standard shader workflow mode to top as it seems more natural.
6 年前
Felipe Lira
65d2e7b3
Minor changes to Unlit shader GUI.
6 年前
Felipe Lira
b89f767a
Fixed null reference on bump properties in unlit particles UI.
6 年前
GitHub
3c27f566
Merge pull request #1180 from Unity-Technologies/rc-bugfixes
RC bugfixes
6 年前
Felipe Lira
6330fd47
Moved standard shader workflow mode to top as it seems more natural.
6 年前
Felipe Lira
22e8d182
Minor changes to Unlit shader GUI.
6 年前
GitHub
9f3d5892
Merge pull request #1186 from Unity-Technologies/backport/rc-fixes
Backport/rc fixes
6 年前
Felipe Lira
5d3094de
Deleted LightweightUtils. Moved work to Core (partial class). Normalized files with the autoformat tool to be consistent to the convention.
6 年前
GitHub
a346a121
Merge pull request #1247 from Unity-Technologies/lw/api-review-v1
Lw/api review v1
6 年前
GitHub
ab445387
Merge pull request #1209 from Unity-Technologies/LWRP
LWRP
6 年前
GitHub
362e32d7
Merge branch 'master' into expose-numlights-per-cluster
6 年前
Remy
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 年前
Frédéric Vauchelles
09596c67
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
6 年前
Stephane Laroche
61ee5830
Merge branch 'master' into stacklit
6 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
GitHub
231beaa3
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
6 年前
sebastienlagarde
0ddaf44e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
Stephane Laroche
10f8090a
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
6 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
6 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
6 年前
Evgenii Golubev
91dc696c
Merge upstream/master
6 年前
Frédéric Vauchelles
4bfaa623
merge master
6 年前
GitHub
8f2d2fc8
Lw/receive shadows prop ( #1830 )
* Added support to receive shadows prop in standard PBS and Simple Lighting shaders.
* Updated test scene
* updated release notes
* addressed PR comment.
* updated test images for test 020.
* merged test scene 020
6 年前
Sebastien Lagarde
cbd762db
Merge branch 'master' into HDRP/staging
6 年前
GitHub
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
egomeh
507df163
Merge branch 'master' into lw/light-attenuation
6 年前
Remy
106a0d43
Merge branch 'hdrp/staging' into hdrp/refactor-reflectionProbe/merge-probe-editors
6 年前
Paul Melamed
9dbd8998
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
6 年前
Yao Xiao Ling
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
GitHub
3e976bf2
Lw/api review v1 ( #1872 )
* Renamed LightweightForwardRenderer to ScriptableRenderer
* Added FB Input and Read macros to LWRP Core
* - Created PerCamera and LightConstantBuffer
- Added _InvCameraViewProj matrix
- Remove unused LightweightConstantBuffer class
* removed string allocation in renderloop. Camera name for profiler should be just fine.
* removed nested camera rendering check. we are preventing it on engine side.
* Fixed type in DefaultRenderer
* removed unreferenced m_IsCameraRendering
* fixed Unlit shader GUI
* Added HALF versions of FRAMEBUFFER_INPUT macros. Remove MS because we only have it partially implemented in SRP shader library.
* Removed empty ForwardLitPass
6 年前
egomeh
e7c59a70
Resolve merge conflicts
6 年前
sebastienlagarde
c5a9708a
Merge branch 'master' into HDRP/add-LightLayer-in-probes
6 年前
RSlysz
bac41534
Merge branch 'HDRP/add-LightLayer-in-probes' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/add-LightLayer-in-probes
6 年前
Yao Xiao Ling
6302a183
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu-terrain
6 年前
GitHub
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
Felipe Lira
d7794acc
Fixed Unlit GI
6 年前
Felipe Lira
c845d271
Revert " Fixed Unlit GI"
This reverts commit 3741dbaef10f9dc80cd3a27fe290e70a9365b0c0.
6 年前
GitHub
965758f6
Lw/fix standardunlitshader ( #1885 )
* Fixed Unlit GI
* Added test for standard unlit shader
* Added release notes
* Add gizmo drawing into LWRP game view
* Add test script to scene
* updated release notes
* added test 053 to test list.
* Added test images.
6 年前
egomeh
170858df
Merge master
6 年前
Yao Xiao Ling
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前