76d74e4f
Move HD sub-shader into HD package
7 年前
0780c903
Fix paths and imports for HD sub-shader
7 年前
ff309c06
Merge pull request #1392 from Unity-Technologies/sg/move-hd-subshader-to-package
Move HD sub-shader to HD package
7 年前
2c4a517b
Merge remote-tracking branch 'origin/master' into build/automation
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDPBRPass.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template.meta
# ScriptableRenderPipeline/HDRenderPipeline/sub-package.json
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/Editor/LightweightPipelineAssetEditor.cs.meta
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightShadowPass.cs.meta
# ScriptableRenderPipeline/Ligh...
7 年前
fafb59af
Run code formatter.
7 年前
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
7 年前
38ca6072
Fix HD sub-shader serialization backwards compatibility
7 年前
baef1950
Merge pull request #1412 from Unity-Technologies/sg/fix-hd-serialization-compat
Fix HD sub-shader serialization backwards compatibility
7 年前
3bad9eab
Add `texCoord1` and `texCoord2` to required fields
7 年前
cb150c06
Merge pull request #1414 from Unity-Technologies/sg/fix-hd-lightmap
Fix HD subshader lightmap support
7 年前
2274ce9d
Merge branch 'master' into sg/fix-for-subgraphs-inside-main-graph
7 年前
ad13e4b0
Add Face Sign functionality to LWRP, HDRP and preview subshaders
7 年前
f37d6cf2
First pass HDRP lit vertex anim
Works, issues to fix:
screen position and view direction are not accesible in vertex shader
unlit shader needs update
7 年前
730563aa
Fixes for Unlit, view direction and screen position.
7 年前
fe5d03f0
Fixed HD Unlit filepath
7 年前
544afac6
Add extra parameter to shader generation functions for master nodes and sub-shaders to track changes to dependencies
7 年前
dc972d16
Merge pull request #1437 from Unity-Technologies/sg/fixhdunlit
Fixed HD Unlit filepath
7 年前
58fd779d
Merge pull request #1435 from Unity-Technologies/sg/import-dependencies
Import dependencies
7 年前
7777e6e0
Merge branch 'vertexAnimHDRP' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRSubShader.cs
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitSubShader.cs
7 年前
aa5fea0a
Fixes for merge with master
7 年前
48ca0fbe
Fixing view direction and screen position in unlit master node
7 年前
d3bcb929
Fixes for vertex animation velocity buffer, screen position
And some refactoring
7 年前
9f55549e
Fix for HD Unlit master node screen position and advanced features.
Cleanup of generated code -- putting debug output on an internal switch.
7 年前
3fa2a503
Fix for unlit screen position, and tangent world space
7 年前
65a6f758
Fix issue with .template and emissive in shader graph for HDRP
7 年前
ac68380c
Merge pull request #1474 from Unity-Technologies/Fix-issue-with-.template-and-emissive-in-shader-graph-for-HDRP
Fix issue with .template and emissive in shader graph for HDRP
7 年前
f7d6e7db
Merge remote-tracking branch 'mainrepo/master' into StackLit2
7 年前
97ac5bf9
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
e8ce5056
Merge branch 'master' into vertexAnimHDRP2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDPBRPass.template
# com.unity.render-pipelines.high-definition/HDRP/Editor/ShaderGraph/HDUnlitPassForward.template
7 年前
51a1873e
Merge branch 'master' into update-changelog
7 年前
f4d8c338
Merge pull request #1449 from Unity-Technologies/vertexAnimHDRP2
Vertex anim HDRP
7 年前
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
900da40e
Merge pull request #1430 from Unity-Technologies/sg/facesign
Add Face Sign functionality
7 年前
6335320b
Declare input and output structs before graph eval functions
7 年前
98221624
Merge pull request #1485 from Unity-Technologies/sg/fix-hd-declaration-order
Fix HD sub-shaders declaration order
7 年前
4a622009
Merge branch 'master' into refactor-shader-variant-per-material
7 年前
3a15d806
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
7bf53f3c
Merge branch 'master' into HDRP-Tests
7 年前
7933fd8d
Merge branch 'master' into StackLit2
7 年前
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
6c870111
Merge branch 'master' into FalseColorMode
7 年前
6353d466
Fix ConvertSurfaceDataToBSDFData argument since change of PR #1505
7 年前
71868227
Merge pull request #1510 from Unity-Technologies/Fix-shader-graph-and-HDRP-shader
Fix ConvertSurfaceDataToBSDFData argument since change of PR #1505
7 年前
7193e88e
Merge branch 'master' into lw/bugfixes
# Conflicts:
# com.unity.render-pipelines.lightweight/CHANGELOG.md
7 年前
01ee049b
Merge branch 'master' into gfx-tests-postfx
7 年前
c493d0fb
Merge remote-tracking branch 'remotes/origin/master' into StackLit2
7 年前
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
7 年前
19222bee
Merge pull request #1518 from Unity-Technologies/hdrpcleanup
HDRP cleanup -- Consolidating shared HDRP code to utility class, cleaning up output shader code by removing debug comments (on internal bool switch)
7 年前
516b896c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
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.
7 年前
a49a696e
Merge branch 'master' into StackLit2
7 年前
9db2a137
Merge branch 'master' into HDRP-Tests
7 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
7 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
c22eb6df
Fix rename of `HasFeatureFlag`
7 年前
237def4f
Merge pull request #1565 from Unity-Technologies/sg/fix-feature-flag
Fix rename of `HasFeatureFlag`
7 年前
4d2914e0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
f46075fb
Merge remote-tracking branch 'mainrepo/master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Lit/Lit.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs.hlsl
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
0ff4b5cc
Fix slot definitions for meta pass in HD PBR subshader
7 年前
32210ac9
Merge branch 'master' into switch-support
7 年前
c1827b93
Rename positionWS to positionRWS + update shader graph template
7 年前
0610a60c
Merge branch 'master' into sg/error-for-incompatible-pipeline
7 年前
86a4970b
Merge pull request #1535 from Unity-Technologies/sg/error-for-incompatible-pipeline
Warn about lack of compatible render pipeline asset
7 年前
853ed68c
Merge pull request #1587 from Unity-Technologies/Improve-camera-relative-rendering
HDRP: Improve camera relative rendering precision on object
7 年前
34ae5a69
Merge branch 'master' into ios-texture-format
7 年前
5196e7ed
Merge branch 'master' into EmissiveMeshForAreaLight
7 年前
a452a9db
Merge branch 'master' into LightUnits
7 年前
1045d10d
Merge branch 'master' into sg/fix-duplicate-subgraphs
7 年前
141afc6f
Merge branch 'master' into decals/v2/per_channel_mask
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/Decal/Decal.cs.hlsl
7 年前
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...
7 年前
1b3f1ca2
Merge branch 'master' into sg/fix-hd-meta-code-cuplication
7 年前
17a341ee
Merge pull request #1580 from Unity-Technologies/sg/fix-hd-meta-code-cuplication
Fix duplication of code from Surf to Vert in HDPBR Subshader meta generation
7 年前
1c4c0d09
Merge branch 'master' into sg/fix-dielectric-specular-control
7 年前
cbb9a885
Merge branch 'master' into StackLit2
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.hlsl
7 年前
8406655d
Merge branch 'master' into ShaderGraphTests
# Conflicts:
# TestProjects/ShaderGraph/Packages/manifest.json
7 年前
cc9ae6f7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
7 年前
9b69a952
Merge xrconfig branch into xrsettings
6 年前
73e96f75
Add macro to show error when using unity_ObjectToWorld/unity_WorldToObject
unity_ObjectToWorld/unity_WorldToObject must not be use as it doesn't handle camera relative rendering
6 年前
a582140e
Merge pull request #1669 from Unity-Technologies/add-macro-to-prevent-wrong-matrix-use
Add macro to show error when using unity_ObjectToWorld/unity_WorldToO…
6 年前
a66ac281
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Branch_FixPreIntegratedFGD
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
6 年前
7c6394fe
Merge pull request #1702 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
1bce3600
Merge branch 'master' into tests/hdrp/distortion
6 年前
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前
7281fe31
Merge branch 'HDRP/staging' into decals/v2/per_channel_mask_new_ui
6 年前
73aab246
Merge branch 'hdrp/staging' into StackLit2_TrunkTest
# Conflicts:
# com.unity.render-pipelines.high-definition/HDRP/Material/StackLit/StackLit.cs
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 年前
80d748f5
Add light linking support ( #1758 )
* HDRP: Add support of light layering for forward (first draft)
TODO:
- Test instancing
- Check perf
- add an option to disable light layer support + in frameSettings
- add deferred rendering support (mean add an optional extra GBuffer)
* Add LightLinking support (version 1 - compile)
This PR add support of LightLayers feature.
To use it, setup mask renderingLayers on renderers and LightLayers on a lights. If a logical and of both give a non 0 value, the light is apply, otherwise it isn't.
This mean that by default LightLayers is 1 and RenderingLayers is 1. Then user can say LightLayers is only 2 and it will only affect renderingLayers with 2 or 3 mask value.
LightLayers require an extra GBuffer in deferred, mean it have extra bandwidth and memory cost.
LightLayers once enabled in HDRPAsset with SupportLightLayers can be control by FrameSettings. Mean a camera can enable extra RT only for an in game cinematic.
This PR refactor...
6 年前
a2d7bf8d
Merge pull request #1759 from Unity-Technologies/Add-Light-Layers
Add light layers features
6 年前
31e46703
Merge pull request #1761 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
be0eb3c8
Merge branch 'master' into tests/hdrp/distortion
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 年前
b088283d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into xrsettings
6 年前
7b744594
Merge branch 'master' into xrsettings
6 年前
56790568
Refactor GetBakedDiffuseLighting
- Shader code change: Rename GetBakedDiffuseLighting to ModifyBakedDiffuseLighting. This function now handle lighting model for transmission too. Lux meter debug mode is factor outisde.
- Shader code change: GetBakedDiffuseLighting is not call anymore in GBuffer or forward pass, including the ConvertSurfaceDataToBSDFData and GetPreLightData, this is done in ModifyBakedDiffuseLighting now
- Shader code change: Added a backBakeDiffuseLighting to BuiltinData to handle lighting for transmission
- Shader code change: Material must now call InitBuiltinData (Init all to zero + init bakeDiffuseLighting and backBakeDiffuseLighting ) and PostInitBuiltinData
- Update shader graph associate code
6 年前
b55f5754
Fix issue with shader graph - wasn't compiling
6 年前
03616069
Merge pull request #1784 from Unity-Technologies/Improve-bakeDiffuseLighting-code
Refactor GetBakedDiffuseLighting
6 年前
6f8854ba
Merge pull request #1786 from Unity-Technologies/HDRP/staging
Hdrp/staging
6 年前
71ec7369
Merge HDRP/staging
6 年前
b364cfd3
Merge branch 'hdrp/staging' into tests/hdrp/distortion
6 年前
4979052d
Moved resources initialization to RenderPipelineResources and Upgrade test to the HDRenderPipeline initialization
6 年前
a11976bf
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
6 年前
6d4f0be7
New template parser ( #1532 )
* Converting template parser to a class to enable recursive $include in the near future
* New template parser working with $include, $splice
Including dependency tracking on $include
* Adding $buildType template command, and cleaning up the code around that.
* Bump major version number. Using ShaderStringBuilder.
* Don't build slot list twice
* Fix view space position for FB case 1064118
6 年前
b400b1c1
Merge branch 'master' into lw/terrain_optimization
6 年前
21479c5f
Merge pull request #1812 from Unity-Technologies/FixHDRPPackageResourceUpgrade
Fix hdrp package resource upgrade
6 年前
0267674b
Merge branch 'master' into HDRP/staging
6 年前
10b216d9
Merge pull request #1825 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
6 年前
b34c6143
HDRP: Remove unused file
6 年前
ee4e73a4
Merge branch 'HDRP/staging' into RemoveSkyInLuxMeter
6 年前
f75e94af
Merge branch 'HDRP/staging' into HDRP/fix/ObliqueLightLoop
6 年前
72141169
Merge branch 'master' into lighting-arealigh-fixup
6 年前
24e59066
Split materialUtilities in 2 files (for VFX editor)
6 年前
3f48dd98
Merge pull request #1837 from Unity-Technologies/Split-material-utilities
Split materialUtilities in 2 files (for VFX editor)
6 年前
05036cac
Merge branch 'HDRP/staging' into HDLightExplorerExtension
6 年前
eb899d7b
Merge pull request #1840 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
6 年前
ce4065fd
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
05f23629
Merge branch 'HDRP/refactor-reflectionProbe/merge-probe-editors' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/refactor-reflectionProbe/merge-probe-editors
6 年前
01fdbb38
Merge branch 'master' into fix/coupling-hdlight-workflow
6 年前
507df163
Merge branch 'master' into lw/light-attenuation
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 年前
2b3f449e
Fixing winding and VFACE order issue + Remove _DetViewMatrix
6 年前
ea9baba9
Merge pull request #1859 from Unity-Technologies/Fixing-winding-and-VFACE-order-issue
Fixing winding and vface order issue
6 年前
ab8c4439
Merge branch 'HDRP/staging' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into HDRP/fix-gcalloc
6 年前
f1d163d5
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
6 年前
cfd45cf1
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
6 年前
e7c59a70
Resolve merge conflicts
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
GitHub
Tim Cooper
Frédéric Vauchelles
Matt Dean
Chris Tchou
Alex Lindman
sebastienlagarde
Stephane Laroche
Oliver Schnabel
Remy
Paul Melamed
Felipe Lira
Thomas
Antoine Lelievre
Nerites
Sebastien Lagarde
Julien Ignace
Aleksandr Kirillov
Yao Xiaoling
RSlysz
egomeh
Yao Xiao Ling