d7929b25
Move Lightweight Shader Graph sub-shaders from SG repo
7 年前
762ac4bc
Fix calls to `Path.Combine` that didn't work on Legacy scripting backend
7 年前
348a27c1
remove #pragma multi_compile for VR stuff
7 年前
f540dc83
Merge pull request #1002 from Unity-Technologies/cleanup
Cleanup
7 年前
e9bb654a
remove #pragma multi_compile for VR stuff
7 年前
667518b2
Merge remote-tracking branch 'origin/master' into lwrp-xr-shader-fixes
7 年前
0593af3c
Updated LW PBR FWD pass template in shader graph.
Removed normal renormalization in frag for mobile targets that don't define "SHADER_HINT_NICE_QUALITY" to 1.
7 年前
81fad193
Merge pull request #1055 from Unity-Technologies/LowEndPerf
Fixes and optimizations for low-end mobile for LW
7 年前
8b48e2b4
Updated the comments about sharing an interpolator between LM UV and vertex SH in LW.
7 年前
4859c628
Merge pull request #1056 from Unity-Technologies/FixComment
Updated the comments about sharing an interpolator between LM UV and …
7 年前
cc4d54eb
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
e630eecd
Merge branch 'master' into LW-Bugfix
7 年前
aa772a18
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered
7 年前
720c8a19
Merge branch 'master'
7 年前
dd8b51a8
Merge branch 'master'
7 年前
e69b9454
Updated LW PBR FWD pass template in shader graph.
Removed normal renormalization in frag for mobile targets that don't define "SHADER_HINT_NICE_QUALITY" to 1.
7 年前
e319329d
Updated ShaderGraph templates
7 年前
79998337
Merge pull request #1075 from Unity-Technologies/backport/LowEndPerf-1055
Backport/low end perf 1055
7 年前
4fce110b
Updated the comments about sharing an interpolator between LM UV and vertex SH in LW.
7 年前
0cac8121
Merge pull request #1091 from Unity-Technologies/lw/bugfixes
Lw/bugfixes
7 年前
049fa5ed
Merge branch 'master' into lw/shadow-optimization
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
043ff4aa
Merge pull request #1076 from Unity-Technologies/backport/FixComment-1056
Updated the comments about sharing an interpolator between LM UV and …
7 年前
da27105b
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
7 年前
1d711357
Merge 'upstream/master'
7 年前
ea16e3eb
Updated ShaderGraph templates
7 年前
8827c1d9
Split LWRP shader library includes (InputSurface, LightweightPassLit and Particles) into several smaller files to have only the required things included.
7 年前
a4c56c1e
Merge pull request #1093 from Unity-Technologies/backport/1091-lw-bugfixes
Backport/1091 lw bugfixes
7 年前
a53684d0
Merge pull request #1127 from Unity-Technologies/lw/surface_cb_split
Lw/surface cb split
7 年前
933c7fdd
Merge branch 'LWRP' into lw/bugfixes
7 年前
b987da15
Merge branch '2018.1' into projects/system-shock/2018.1
7 年前
c856eeed
Fixed broken shadergraph LW PBR shader template.
7 年前
5e57070a
Merge pull request #1134 from Unity-Technologies/lw/fix_shadergraph
Shadergraph fix for LW PBR template
7 年前
de8adb82
Merge branch 'LWRP' into lw/multipass
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLit.hlsl
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLitSimple.hlsl
# ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/LightweightPassLitSimple.hlsl.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Shaders/LightweightStandardSimpleLighting.shader
7 年前
f98f82d0
Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass
7 年前
cb320661
Initial push
-Fixed Shader Graph PBR template shadows and defines to match LW
-Fixed Shader Graph Unlit template defines to match LW
-Culling in depth pre pass fixed in LW PBR
7 年前
1c37ea07
-Fixed Shader Graph PBR template shadows and defines to match LW
-Fixed Shader Graph Unlit template defines to match LW
-Culling in depth pre pass fixed in LW PBR
7 年前
8efc63d9
Merge pull request #1166 from Unity-Technologies/backport/shadergraph-template-fixes
Backport/shadergraph template fixes #1153
7 年前
7fd656f4
Split LWRP shader library includes (InputSurface, LightweightPassLit and Particles) into several smaller files to have only the required things included.
Conflict:
- LightweightUnlitExtraPasses.template
7 年前
dadee06e
Merge pull request #1153 from Unity-Technologies/lw/shadergraph_fixes
ShaderGraph template fixes
7 年前
27947037
Shadergraph fix for LW PBR template
Conflict:
- LightweightStandardSimpleLighting.shader
7 年前
01e09fae
Merge pull request #1183 from Unity-Technologies/backport/rc-bugfixes-and-optimization
Backport/rc bugfixes and optimization
7 年前
a39db674
Updated ShaderGraph templates
6 年前
9aa25b18
Merge pull request #1243 from Unity-Technologies/lw/shader-keywords-stripping
Lw/shader keywords stripping
6 年前
298cb6b0
Auto format of shader graph files.
6 年前
a346a121
Merge pull request #1247 from Unity-Technologies/lw/api-review-v1
Lw/api review v1
6 年前
ab445387
Merge pull request #1209 from Unity-Technologies/LWRP
LWRP
6 年前
362e32d7
Merge branch 'master' into expose-numlights-per-cluster
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 年前
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 年前
61ee5830
Merge branch 'master' into stacklit
6 年前
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
231beaa3
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
6 年前
0ddaf44e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
6 年前
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
6 年前
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 年前
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
6 年前
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
6 年前
91dc696c
Merge upstream/master
6 年前
4bfaa623
merge master
6 年前
2f656824
Update lightweight subshaders and templates to support vertex mod
6 年前
0546ae13
Fix template issues
6 年前
c43790f0
Fixes for PR
6 年前
ae1dff05
Merge pull request #1358 from Unity-Technologies/sg/vertex-modification
Vertex Modification
6 年前
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
6 年前
3be7d580
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
9498fe0b
Merge branch 'master' into stacklit
6 年前
36a0484f
Merge remote-tracking branch 'origin/master' into sg/texture-types
6 年前
3932faa4
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/CHANGELOG.md
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCameraFrameHistoryType.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl
6 年前
7f5da648
Merge branch 'master' into sg/show-generated-code
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 年前
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
6 年前
544afac6
Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies
6 年前
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
6 年前
d3bcb929
Fixes for vertex animation velocity buffer, screen position
And some refactoring
6 年前
51a1873e
Merge branch 'master' into update-changelog
6 年前
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
6 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
6 年前
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
6 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
6 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
6 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
6 年前
7933fd8d
Merge branch 'master' into StackLit2
6 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
6 年前
d0452097
GPU Instancing work on LWRP shadergraph shaders
-Fixed placement of main passes instancing setup
-Added missing stereo instancing macros
-Added missing fragment Instancing ID for future work in shadow/depth passes
6 年前
ecc51271
Reverted the additional instancing ID in the vertex input.
6 年前
30801fdf
Revert file to before branch off.
6 年前
c64e5f3f
Merge pull request #1496 from Unity-Technologies/lw/shadergraph-instancing-fix
LWRP Shadergraph GPU instancing fixes
6 年前
6c870111
Merge branch 'master' into FalseColorMode
6 年前
c95b7c47
Merge branch 'master' into normal-buffer-support
6 年前
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
6 年前
312a5259
Screenspace shadow resolve is only done in case of cascade shadows.
6 年前
7842bbf8
Merge remote-tracking branch 'mainrepo/master' into StackLit2
6 年前
ecdbdcab
Merge branch 'StackLit2' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into StackLit2
6 年前
98989fb6
Merge branch 'master' into HDRP-Tests
6 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
6 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
6 年前
6408007a
Merge branch 'master' into hdrpcleanup
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
6 年前
93c87374
Merge pull request #1516 from Unity-Technologies/lw/shadow-optimization
Lw/shadow optimization
6 年前
b52b15f0
Fixed wrong keyword in shader graph shadow template
6 年前
96162457
Merge pull request #1528 from Unity-Technologies/lw/fix-shadergraph-shadowtypo
Fixed wrong keyword in shader graph shadow template
6 年前
549996da
Allow sub-shaders to tell whether they are compatible with a given render pipeline, and hook it up with the UI support for that such that an error is shown in the event that it's _not_ compatible.
This also adds a check in Update() such that the UI is reloaded when the render pipeline changes.
6 年前
a49a696e
Merge branch 'master' into StackLit2
6 年前
9db2a137
Merge branch 'master' into HDRP-Tests
6 年前
25f5aa64
Merge branch 'master' into lw/lw-pipeline-asset-inspector
6 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
86a4970b
Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline
Warn about lack of compatible render pipeline asset
6 年前
34ae5a69
Merge branch 'master' into ios-texture-format
6 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
6 年前
a452a9db
Merge branch 'master' into LightUnits
6 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
6 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
6 年前
540d190a
Merge branch 'master' into HDRP-Tests
# Conflicts:
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1102_Unlit_Distortion.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1103_Unlit_Distortion_DepthTest.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1202_Lit_DoubleSideNormalMode.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1204_Lit_Transparent_Fog.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1208_Lit_Displacement_POM.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1209_Lit_Displacement_Vertex.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1210_Lit_BentNormal.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/WindowsEditor/Direct3D11/1302_SSS_MaxRadius.png
# TestProjects/HDRP_Tests/Assets/ReferenceImages/Linear/Window...
6 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
6 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
6 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
6 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
6 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
868aeec4
Generate correct depth and shadow passes for LW with alpha clip ( #1590 )
* Add minimal surface definition to LWRP depth and shadow passes
* Update changelog
* Fix LW Unlit subshader shadow/depth clip
6 年前
2883e443
Merge branch 'master' into tests/hdrp/distortion
6 年前
4c6e512a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7a18f28e
Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings"
This reverts commit b4235a00abc6fa6e57b0ec4e3b9ac5476a00483b, reversing
changes made to 9f8c48222c8e832dafba28a61d7eb38a18a5f9c8.
6 年前
5182ab18
Revert "Revert "Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings""
This reverts commit ec4368043e0e48024a999926b30a6d885a9c6d5d.
6 年前
74d0a872
Merge pull request #1745 from Unity-Technologies/master
Merge from master
6 年前
5bfcc8cd
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-sun-baking
6 年前
4d7a5d51
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
de2f585d
Fix compiler warnings.
6 年前
cd85f0d3
Merge branch 'master' into HDRP/staging
6 年前
d5e69c03
Merge HDRP/staging
6 年前
72687aa9
Merge branch 'HDRP/staging' into HDRP/fix/reflection-probe-offset-with-rotation
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
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 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
7cfc2ed0
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
6 年前
8908da09
Pipeline specific graph functions and nodes ( #1673 )
* Refactor GraphFunctions includes to per-pipeline
* Add Scene Color node
- And camera opaque requirements
- Returns 0s in HD
* Add Scene Depth node
* Rename GraphFunctions.hlsl > ShaderGraphFunctions.hlsl
* Update references to ShaderGraphFunctions.hlsl
6 年前
93afc87c
Merge remote-tracking branch 'origin/master' into lw/light-attenuation
6 年前
5eed6e3a
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
Peter Bay Bastian
Antti Tapaninen
GitHub
Evgenii Golubev
Robert Srinivasiah
Aleksandr Kirillov
Remy
Felipe Lira
sebastienlagarde
Raymond Graham
Matt Dean
Andre McGrail
Frédéric Vauchelles
Stephane Laroche
Yao Xiaoling
Alex Lian
Tim Cooper
Chris Tchou
Oliver Schnabel
Paul Melamed
Sebastien Lagarde
Thomas
Nerites
Antoine Lelievre
Julien Ignace
Yao Xiao Ling
egomeh