sebastienlagarde
1ec6d8b9
First set of files
First set of files submit to iniate the project and be able to work from
home :)
This is WIP and files will move/change.
For now just a set of file mostly empty, setup name etc...
8 年前
sebastienlagarde
940b6d13
Update ShaderLibrary and UnityStandard code
Several addition.
Add a forward and deferred pass not working with lighting
Add pack/unpack attribute
Reoarganize some file
better header dependecy
Remove platform, will not be used
8 年前
Joachim Ante
32b23b9d
Refactor API validation code to actually check that each define is
indeed define, this prevents platforms from going out of sync.
8 年前
GitHub
213ac319
Merge pull request #1 from Unity-Technologies/API-Validation
Api validation
8 年前
sebastienlagarde
4ec829d0
Merge branch 'ShaderLibrary' of https://github.com/Unity-Technologies/ScriptableRenderLoop into ShaderLibrary
8 年前
sebastienlagarde
4984a6d0
Prepare for deferred rendering
Add FinalPass (for gamma correction), create init buffer and clear
buffer function, prepare deferred renderer buffer. Deferreded pass not
implemented yet
8 年前
sebastienlagarde
e0d8b29f
Minor change, add unity_reversed_z
8 年前
Sebastien Lagarde
48e7ab2d
Merge branch 'ShaderLibrary' of https://github.com/Unity-Technologies/ScriptableRenderLoop into ShaderLibrary
8 年前
sebastienlagarde
0c45d07f
HDREnderLoop: Convert CGPROGRAM to HLSLPROGRAM + Add double sided support
Double sided still not work yet
8 年前
sebastienlagarde
b7ac9b37
HDRenderLoop: Make transparent object working + doublesided mode work
8 年前
Julien Ignace
60e032e0
Merge branch 'master' into DebugShader
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
sebastienlagarde
acd11ee0
HDRenderLoop Rename DisneyGGX to Li and convert to whitesapce convention
8 年前
sebastienlagarde
b2a49403
HDRenderLoop; start support of reflection probe
- Add texture abstration in API
- Add imagebasedlighting.hlsl
- Add divide pi version of BSDF
- Change resolution of cubemap as 128
- Misc stuff
8 年前
sebastienlagarde
fe99ce30
HDRenderLoop: Add PreLightData concept (optimization)
- Add PrelightData concept: variable that you can precompute ahead of
calling the lighting loop
- Various stuff related to that: BRDF recomputed LambdaV version etc...
8 年前
vlad-andreev
bf6e54c5
tabs -> spaces
8 年前
sebastienlagarde
feca166f
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Debug/DebugViewMaterialGBuffer.shader
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Lighting/LightingForward.hlsl
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit.hlsl
# Assets/ScriptableRenderLoop/ShaderLibrary/Common.hlsl
8 年前
Sebastien Lagarde
236dada1
HDRenderLoop: Plenty of stuff + Meta pass renaming + Depth pass
- Add EnvTemplate to generate various combinaison of cube texarray and
simple cube for evaluteBSDF_env
- Rename class/file
- Introduce concept of FragInput
8 年前
GitHub
ca67bebf
Merge pull request #5 from Unity-Technologies/LightmapSupport
Add Meta pass + Depth pass support
8 年前
Sebastien Lagarde
1602a326
HDRenderLoop: Push draft not compiling
8 年前
Paul Demeulenaere
93fd6e5e
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
sebastienlagarde
f53cd1c7
HDRenderloop: Progress in supporting IES and shadowmap
- Add AffectDiffuse/AffectSpecular/GetShadowDimmer UI
- Add draft of shadow map support (not working)
- Add IES in shader (not in light)
- Add LightLoopContext struct
- Add various Texture/sampler macro
- Add GetCubeFaceID
- misc stuff
8 年前
sebastienlagarde
cb428a02
HDRednerLoop: Again msising file...
8 年前
GitHub
89924c46
Merge pull request #7 from Unity-Technologies/ShadowMapSupport
First draft design of shadowmap
8 年前
Paul Demeulenaere
a87df4d4
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Sebastien Lagarde
d75972a9
HDRenderLoop: Add LightProbe + ProbeVolume support (not tested)
8 年前
Sebastien Lagarde
e7a1bb1b
HDRenderLoop: Update to new texture abstraction everywhere
8 年前
Paul Demeulenaere
d6e910a1
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
sebastienlagarde
fc554180
HDRenderLoop: Rename TEXTURE2D_PASS to TEXTURE2D_PARAM
8 年前
Paul Demeulenaere
66d8d3f0
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Sebastien Lagarde
d8f13193
HDRenderloop: Setup minimal draw sky/HDRI (not working)
8 年前
sebastienlagarde
1225abd4
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
Julien Ignace
2d47017c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitData.hlsl
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/LitDebugPass.hlsl
8 年前
Evgenii Golubev
290723c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into UpdateAreaLightImpl
8 年前
Paul Demeulenaere
e7df382c
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitignore
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
# Assets/ScriptableRenderLoop/HDRenderLoop/Shaders/Material/Lit/Lit.cs
8 年前
sebastienlagarde
91937fed
HDRenderLoop: Merge FPTL - start light application
- all broken for now
8 年前
Paul Demeulenaere
2b2b5808
Merge branch 'master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/Lit/Editor/LitUI.cs
8 年前
Julien Ignace
9b94966f
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Sebastien Lagarde
a91df7f9
HDRenderLoop: Merge FTPL - application of opaque tiled lists (untested)
8 年前
Evgenii Golubev
0ad558b0
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Julien Ignace
0065b8b6
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/HDRenderLoop.cs
8 年前
Paul Demeulenaere
16333450
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Evgenii Golubev
1b21bc2e
Remove dangerous texture coordinate casts
8 年前
Evgenii Golubev
a22137fb
Add gather support
8 年前
Evgenii Golubev
4e63bc81
Merge branch 'master' into SkySystem
8 年前
Evgenii Golubev
845ca501
Fix gather macros
8 年前
Evgenii Golubev
54cf6a15
Merge branch 'master' into SkySystem
8 年前
Evgenii Golubev
22b19840
Add missing macro parameters
8 年前
Evgenii Golubev
5bec13fc
Merge branch 'master' into SkySystem
8 年前
Evgenii Golubev
84ef01ec
Remove GATHER_TEXTURE3D (does not exist)
8 年前
GitHub
06953530
Merge pull request #23 from EvgeniiG/master
Add the initial impl. of the sky model from the Blacksmith demo
8 年前
runes
0feeb77b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
fc0cb9a4
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into SkySystem
8 年前
Paul Demeulenaere
ab48557b
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
8 年前
Julien Ignace
668f9372
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderLoop/Material/LayeredLit/Editor/LayeredLitUI.cs
8 年前
Evgenii Golubev
52100761
Use texture Load() instead of sampling
8 年前
Evgenii Golubev
c31ad089
Build probability tables using only 2D textures (cubemaps as arrays)
8 年前
Evgenii Golubev
e195a008
Remove semicolons after macro definitions
8 年前
Evgenii Golubev
ab866dab
Add the initial implementation of light importance sampling
8 年前
Evgenii Golubev
6fed15cc
Correct and rename UNITY_SPECCUBE_LOD_STEPS
8 年前
Evgenii Golubev
6f11466b
Revert the UNITY_SPECCUBE_LOD_STEPS change
8 年前
Evgenii Golubev
a8c79dbc
Move UNITY_SPECCUBE_LOD_STEPS out of D3D11.hlsl
8 年前
GitHub
f3e5d8cd
Merge pull request #70 from EvgeniiG/master
Improve the quality of EnvMap filtering
8 年前
Felipe Lira
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
Julien Ignace
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
Arnaud Carre
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
Julien Ignace
7b7eb3b4
Fixed a number of compilation issue with PS4.
8 年前
GitHub
a04d917d
Merge pull request #92 from Unity-Technologies/Branch_fix-ps4-hdrenderloop
Fixed a number of compilation issue with PS4.
8 年前
Evgenii Golubev
74657c39
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
05e84b23
Merge branch 'master' into lowendmobile
8 年前
sebastienlagarde
34ba21bb
HDRenderPipeline: Push draft for adding POM
8 年前
GitHub
2998dd35
Merge pull request #104 from Unity-Technologies/Add-ParallaxOcclusionMapping
Add parallax occlusion mapping (near working version)
8 年前
Julien Ignace
4ce76493
Added V2 of height base blend + inherit from base layer albedo option.
8 年前
Evgenii Golubev
8b521e10
Merge branch 'master' into SSSSS
8 年前
Juho Oravainen
4320bff0
Initial metal support kickoff. Tweaked shader pragma targets from 5.0 to 4.5. Added metal to only_renderers lists. Added initial platform header API/Metal.hlsl. Couple of include paths changed to absolute until a bugfix lands on Unity side.
8 年前
GitHub
2ba6f819
Merge pull request #108 from Unity-Technologies/metal
Initial macOS Metal support for HDRenderPipeline + some iOS fixes in FTPL
8 年前
GitHub
272bdc72
Merge pull request #110 from Unity-Technologies/LayeredLit
Added V2 of height base blend + inherit from base layer albedo option.
8 年前
Antti Tapaninen
19b9d7f6
add new macros that were missing from Metal.hlsl
8 年前
Evgenii Golubev
087242cd
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
21be7561
Merge branch 'master' into SSSSS
8 年前
Tim Cooper
d4271c8c
Merge remote-tracking branch 'origin/master' into preview-cameras
8 年前
Tim Cooper
171302ee
Merge branch 'preview-cameras' into refactor-hdloop
Conflicts:
Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Paul Demeulenaere
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
Arnaud Carre
2cdff1ec
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset.meta
# Assets/TestScenes/HDTest/HDRI.meta
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectSettings.asset
8 年前
uygar
2a8f7eaa
Added missing files from initial commit.
8 年前
Felipe Lira
be52007a
Merge branch 'master' into lowendmobile
8 年前
Antti Tapaninen
0c84a4f2
explicitly set unity_ProbeVolumeSH precision
8 年前
GitHub
e2f52112
Merge pull request #132 from Unity-Technologies/metal
Metal
8 年前
sebastienlagarde
f3984098
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-POM-+-Heightmap-behavior
8 年前
Julien Ignace
506c1212
Merge branch 'master' into Branch_DebugShadows
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
8 年前
Julien Ignace
0da32ed1
Merge branch 'master' into Branch_DebugLighting
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Editor/HDRenderPipelineInspector.cs
# Assets/ScriptableRenderLoop/HDRenderPipeline/HDRenderPipeline.cs
8 年前
runes
3b9f1e7d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Evgenii Golubev
538bf3b2
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Arnaud Carré arnaud@unity3d.com
ca6b7f62
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching.meta
# Assets/BasicRenderBatching/LightingBatching.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderLoop/HDRenderPipeline/PostProcess/Resources/Textures.meta
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/CascadedShadowsTest.meta
# Assets/TestScenes/HDTest/GlobalIlluminationTest/LightingData.asset
# Assets/TestScenes/HDTest/GraphicTest/Two Sided/Prefabs/Materials.meta
# Assets/TestScenes/HDTest/Leaf.meta
# Assets/TestScenes/HDTest/Leaf/GroundLeaf.meta
8 年前
Arnaud Carre
89d05b25
Merge branch 'batch_rendering' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/BasicRenderBatching/LightingBatchingProbe.unity
8 年前
uygar
c8a27740
Merge branch 'master' into shadows
8 年前
Felipe Lira
0905d0bc
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/ScriptableRenderPipeline/RenderPasses/ShadowRenderPass.cs
# ProjectSettings/QualitySettings.asset
8 年前
GitHub
5444da2d
Merge pull request #164 from Unity-Technologies/shadows
Shadows
8 年前
sebastienlagarde
86828cff
Merge remote-tracking branch 'origin/master'
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
sebastienlagarde
70e640d7
Merge remote-tracking branch 'refs/remotes/origin/master' into HDR-capture-for-reflection-probe
8 年前
Arnaud Carre
3c290788
Merge branch 'master' into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/TestScenes/Big
# Assets/TestScenes/HDTest/Material/HDRenderLoopMaterials/Lit_Emissive_Blue.mat
8 年前
runes
cb7bce50
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
557acdfd
Merge branch 'master' into lowendmobile
# Conflicts:
# Assets/LowEndMobilePipeline/TestScenes/Materials.meta
# Assets/ScriptableRenderPipeline/Editor/MaterialUpgrader.cs
# Assets/TestScenes/HDTest/GraphicTest/LayeredTessellation/Material.meta
# Assets/TestScenes/HDTest/LayeredLitTest/Mesh/Materials.meta
8 年前
Evgenii Golubev
08262cdc
Implement ZERO_INITIALIZE_ARRAY()
8 年前
vlad-andreev
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
GitHub
a011b30d
Merge pull request #220 from EvgeniiG/master
Implement projector lights
8 年前
uygar
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
8 年前
Filip Iliescu
3a226917
merged master
8 年前
David Rogers
c29dfe78
Add more GLES3 and Vulkan shader libraries.
8 年前
David Rogers
c564d3bd
Revert "Add more GLES3 and Vulkan shader libraries."
This reverts commit f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
Evgenii Golubev
2c8fcff2
Output HTile via a pixel shader
8 年前
Evgenii Golubev
f3d8504d
Add the SSS profiling scene
7 年前
GitHub
f92ef9c5
Merge pull request #342 from EvgeniiG/opt_sss
Port SSS to compute with an LDS texture cache
7 年前
Rune Stubbe
5f1e866a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
Arnaud Carre
ad0fb3d8
Merge branch 'master' into Branch_Batching2
7 年前
Filip Iliescu
28a25cc0
merged master
7 年前
Filip Iliescu
0bef2753
add hlsl support libraries for Vulkan and ES3
7 年前
Felipe Lira
7d62ca8f
Merge branch 'master' into LightweightPipeline
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/Shaders/LightweightPipeline.shader
7 年前
Mikko Strandborg
0d0cd3fe
Add Vulkan shader support files
7 年前
GitHub
18d42f5f
Merge pull request #524 from Unity-Technologies/vulkan
Vulkan support for scriptable renderpipe.
7 年前
Paul Melamed
650a7ab4
debugging projecting a decal onto geometry
7 年前
Evgenii Golubev
8c2d94e7
Add WaveReadFirstLane()
7 年前
Evgenii Golubev
fcfe787e
Remove the Clamp() intrinsic
7 年前
GitHub
3f66af34
Merge pull request #545 from EvgeniiG/Unity-2017.3
Improve subsurface scattering
7 年前
GitHub
b6cf8abe
Merge pull request #549 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Evgenii Golubev
a46c0009
Merge the old volumetrics code (WIP)
7 年前
sebastienlagarde
a1929730
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Material/Character.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/ComplexMaterial/Textures.meta
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/0xxx.meta
7 年前
Julien Ignace
11c1d9a8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
7 年前
Julien Ignace
220e0aff
Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
e4ffdd2d
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
Evgenii Golubev
d1c74bcb
Merge branch 'master'
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 年前
sebastienlagarde
188e343b
HDRenderPipeline: Add SAMPLE_DEPTH_TEXTURE to our various API
7 年前
Peter Andreasen
1432e316
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Evgenii Golubev
7b797ff7
Merge branch 'master'
7 年前
Peter Bay Bastian
85e38a3c
Merge branch 'master' into shader-include-paths-2
7 年前
Frédéric Vauchelles
fe773302
Merge master
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 年前
Sebastien Lagarde
0cdbadfa
First draft
7 年前
Sebastien Lagarde
2d0640a5
Draft 2
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 年前
sebastienlagarde
0feb39a6
HDRenderPipeline: Add xboxone support
7 年前
Paul Melamed
dd2f4c60
Decals work with master and trunk
7 年前
Felipe Lira
a5dbc063
Ported Lightweight to SRP shader library.
7 年前
GitHub
4b15e9fc
Merge pull request #651 from Unity-Technologies/add-xbone-one-support
Add xbone one support
7 年前
Felipe Lira
b89532b8
Added GLCore and GLES2 files. Ported more shaders to SRP shader library and fixed some compilation GLES2 compilation errors in shader library.
7 年前
Felipe Lira
bbaa74a6
Fixed compiler errors in GLES2.hlsl
7 年前
Felipe Lira
90918be4
added uint -> int mappings
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
7 年前
Felipe Lira
fd3df2bf
Merge branch 'Lightweight-ConstantBufferRefactor' into LightweightPipeline
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 年前
Evgenii Golubev
4cd2d228
Replace all sampler macros with SAMPLER
7 年前
GitHub
f080e1c3
Merge pull request #672 from EvgeniiG/master
Reduce the number of samplers used by the HDRP
7 年前
Evgenii Golubev
26ec6100
Update the texture abstraction to support shadows
7 年前
GitHub
8bc53acd
Merge pull request #673 from EvgeniiG/master
Update the texture abstraction to support shadows
7 年前
Remy
79cf2e14
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
dfa4e4f9
Add SAMPLE_TEXTURE3D_LOD
7 年前
Evgenii Golubev
c16681df
Merge branch 'master'
7 年前
GitHub
76cdb543
Merge pull request #674 from EvgeniiG/master
Add SAMPLE_TEXTURE3D_LOD
7 年前
Evgenii Golubev
d1b5d0f0
Fix parameter order of BFE
7 年前
sebastienlagarde
bb7e9ab5
ShaderLibrary: Add Gather red/gree/blue to API
7 年前
sebastienlagarde
1a5807f3
Missing API update for gather red/green/blue
7 年前
Evgenii Golubev
55462675
Add comment
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 年前
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 年前
GitHub
ab1a6cff
Merge pull request #685 from EvgeniiG/master
Store light.range in lightData.size.x for box lights
7 年前
Sebastien Lagarde
657828b3
Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-frameSettings
7 年前
Evgenii Golubev
fbfbcd6c
Add the BitFieldInsert() intrinsic
7 年前
Evgenii Golubev
7779e807
Merge branch 'master'
7 年前
Felipe Lira
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
Felipe Lira
ac553840
Updated shaders after merge
7 年前
Felipe Lira
cea04fcf
Addressed Sebastien and Alexandr PR feedbacks.
7 年前
Felipe Lira
eff2ed49
Addressed Evgenii and Richard's comments.
7 年前
Frédéric Vauchelles
50a43207
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Julien Ignace
c02d593d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Editor/HDRenderPipelineMenuItems.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/AtmosphericScattering/AtmosphericScattering.cs
# ScriptableRenderPipeline/HDRenderPipeline/Sky/SkyManager.cs
7 年前
GitHub
b8b228d9
Merge pull request #693 from EvgeniiG/master
Add temporal integration support to the Disney SSS
7 年前
Evgenii Golubev
78563feb
Merge branch 'master'
7 年前
Evgenii Golubev
19d47a75
Add LOAD_TEXTURE3D() and LOAD_TEXTURE3D_LOD()
7 年前
Frédéric Vauchelles
ac97e406
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
GitHub
1b90eb6b
Merge pull request #687 from Unity-Technologies/LightweightPipeline
Lightweight pipeline upgrade to SRP shader library
7 年前
GitHub
f97428c9
Merge pull request #703 from EvgeniiG/this_is_the_branch_you_are_looking_for
Add LOAD_TEXTURE3D() and LOAD_TEXTURE3D_LOD()
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 年前
sebastienlagarde
d83489f4
Change ShaderLibrary to use REAL instead of float/half
7 年前
sebastienlagarde
ecdf681c
ShaderLibrary, change REAL to real
7 年前
Julien Ignace
65bd8e1d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
Evgenii Golubev
89360f4e
Revert the changes to API files
7 年前
Frédéric Vauchelles
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
7 年前
Frédéric Vauchelles
281fe5bf
Use macro for depth down sample and support when gather red is not available
7 年前
Frédéric Vauchelles
9bdc053e
Added Gather support for PS4, XboxOne and Vulkan
7 年前
GitHub
276e8580
Merge pull request #728 from Unity-Technologies/feature/ReflectionProbeEditor
Feature/reflection probe editor
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 年前
Evgenii Golubev
1f5d453d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline
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 年前
Paul Melamed
8efbc8a6
Merge branch 'master' into prototype/decals_no_height
# Conflicts:
# PostProcessing
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipelineAsset.asset
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 年前
sebastienlagarde
b9b30507
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
GitHub
b83e5de0
Merge branch 'master' into feature/mip-debug
7 年前
lyndon homewood
064d57c1
Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/Common.hlsl
7 年前
Evgenii Golubev
c86b3214
Merge branch 'master'
7 年前
Evgenii Golubev
8a70dc3b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Felipe Lira
e2a63632
Added VERTEXID_SEMANTIC to api files. Fixed BlitCubeTextureFace shader on gles 2.0.
7 年前
Felipe Lira
81845faa
defining texture gather to error on unsuported hardware.
7 年前
Felipe Lira
25aa15b7
Defined functions explicitly as error when we can't provide a good fallback. Adjusted shader feature level for texture gather and texcube array.
7 年前
GitHub
ab46e660
Merge pull request #778 from Unity-Technologies/ShaderLibraryFixes
Shader library fixes on GLES 2.0.
7 年前
sebastienlagarde
8324b5e9
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-light-unity-support
7 年前
sebastienlagarde
7f5f1c1a
Merge remote-tracking branch 'refs/remotes/origin/master' 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 年前
Kay Chang
42c358c5
Added Switch support for SRP sample project.
C# scripts modified to build without XR support on Switch.
7 年前
Felipe Lira
1b2ea142
Checking for Cubemap array support on OGL based on what front end compiler expects instead of SM capability.
7 年前
Evgenii Golubev
77f9f167
Merge branch 'master'
7 年前
Peter Andreasen
3ccf74cc
merged from master
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 年前
GitHub
602cf8ca
Merge pull request #796 from Unity-Technologies/OGL-CubemapArrayCheck
Checking for UNITY_NO_CUBEMAP_ARRAY support in OGL files.
7 年前
sebastienlagarde
54919201
Merge remote-tracking branch 'refs/remotes/origin/master' into Fix-issue-with-SSS-and-layering
7 年前
Evgenii Golubev
5b66c29a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into opt_ps4_2018_01
7 年前
John
dea94b9d
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Paul Melamed
15162b54
Merge branch 'master' into prototype/decals_premult_alpha
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/ShaderPass/ShaderPassDBuffer.hlsl
7 年前
Sebastien Lagarde
b32a2d17
Merge remote-tracking branch 'refs/remotes/origin/master' into HDRP_GraphicTests
7 年前
Evgenii Golubev
a3209dd5
Fix INTRINSIC_CUBEMAP_FACE_ID
7 年前
Sebastien Lagarde
07354cce
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-SSS-and-transmission
7 年前
Remy
c3c7eec1
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity
7 年前
Sebastien Lagarde
a5003db5
Merge remote-tracking branch 'refs/remotes/origin/master' into feature/PlanarReflection
7 年前
sebastienlagarde
1d94ca60
Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow
7 年前
John
cf25c602
Merge master
7 年前
sebastienlagarde
174630e7
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
uygar
81cb95dc
Merge branch 'master' into shadows-biasing
7 年前
John
ba0245c3
Merge branch 'master' into LW-ScreenSpaceShadows
7 年前
Peter Andreasen
8b8ef607
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
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 年前
sebastienlagarde
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
uygar
275279fa
Introduced new macros for flow control attributes.
7 年前
GitHub
2376836c
Merge pull request #858 from Unity-Technologies/shadows-biasing
Shadows biasing
7 年前
Robert Srinivasiah
6626255e
Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting
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 年前
uygar
3e0f23cb
Added flow control macros to more platforms. The source initially passes through the hlsl compiler which understands these directives, independent of the platform compiler.
7 年前
sebastienlagarde
776082ee
Added flow control macros to more platforms. The source initially passes through the hlsl compiler which understands these directives, independent of the platform compiler.
7 年前
John Parsaie
8cc0d941
Merge SRP 2018.1
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 年前
GitHub
47d42b36
Merge pull request #1 from Unity-Technologies/master
Merge from main
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 年前
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 年前
Aleksandr Kirillov
3ee0f4b3
Added LOAD_TEXTURE2D_ARRAY_MSAA to the Core API.
7 年前
GitHub
15d94d6d
Merge pull request #1244 from Unity-Technologies/lw/depth_copy_vr_support
Lw/depth copy vr support
7 年前
Kay Chang
947cb257
WIP adding switch support (not working yet).
7 年前
Kay Chang
c279dc9c
Re-added modified files for Switch without BOM.
7 年前
GitHub
231beaa3
Merge pull request #1269 from Unity-Technologies/LWRP
Lwrp
7 年前
sebastienlagarde
0ddaf44e
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
7 年前
GitHub
f8e74a10
Merge pull request #1277 from Unity-Technologies/switch_support
Switch support
7 年前
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
7 年前
Stephane Laroche
ecc9d71b
Merge remote-tracking branch 'mainrepo/master' into stacklit
7 年前
sebastienlagarde
2c1c78cf
Merge branch 'master' into 2018.1-experimental
7 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
Raymond Graham
4e9dca70
Merge branch 'master' into volumetric-lighting-updates
7 年前
Evgenii Golubev
91dc696c
Merge upstream/master
7 年前
Frédéric Vauchelles
4bfaa623
merge master
7 年前
Felipe Lira
25e45b36
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
63a6fe03
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
7 年前
Felipe Lira
60efd574
Added float and half variants to instrisicts
7 年前
Felipe Lira
0c03cb67
Added proper _half / _float suffix on hlsl as this is what our compiler backend actually expects.
7 年前
Felipe Lira
175cbd2f
Fixed line ending on API files
7 年前
GitHub
9326bf71
Merge pull request #1379 from Unity-Technologies/float-half-instrisics
Float half instrisics
7 年前
Frédéric Vauchelles
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
7 年前
Peter Bay Bastian
927000b8
Merge branch 'master' into sg/texture-types
7 年前
sebastienlagarde
c0461407
Merge branch 'master' into Add-support-of-per-light-shadow-mask-control
7 年前
GitHub
7f5da648
Merge branch 'master' into sg/show-generated-code
7 年前
Tim Cooper
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 年前
Evgenii Golubev
c966eb56
Update Shader API Files
Add RW_TEXTURE2D_ARRAY
Add SAMPLE_TEXTURE2D_ARRAY_GRAD
Add GATHER_ALPHA_TEXTURE2D (skipped GL)
Remove offsets from GATHER to make it consistent across APIs
7 年前
GitHub
59662aac
Merge pull request #1452 from EvgeniiG/api_files_update
Update Shader API Files
7 年前
Paul Melamed
9f1637c0
Merge branch 'master' into decals/NoHDRP_exception
7 年前
Stephane Laroche
d85052d9
Merge branch 'master' into StackLit2
7 年前
Chris Tchou
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 年前
GitHub
51a1873e
Merge branch 'master' into update-changelog
7 年前
Peter Bay Bastian
b4dd9062
Merge remote-tracking branch 'origin/master' into sg/facesign
7 年前
Paul Melamed
797daf79
Merge branch 'master' into decals/ss3_channel_mask
7 年前
Chris Tchou
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 年前
Yao Xiaoling
7ba05ba9
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
7 年前
Aleksandr Kirillov
4695f235
Merge branch 'master' into lw/terrain_optimization
6 年前