1f804bdc
moved editor-specific shader generator code to an Editor folder
8 年前
6d674ea7
forgot to commit a file
8 年前
f68e8b7c
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# .gitmodules
8 年前
b0bf5e66
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
41003740
Add support of 'bool' to the ShaderGenerator
8 年前
064c17bd
Merge pull request #11 from EvgeniiG/master
Implement ellipsoidal fade out for area lights
8 年前
ed862ed6
Merge remote-tracking branch 'refs/remotes/origin/master' into Merge-FPTL
8 年前
aac1235c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
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 年前
102b0ab8
- Unlit shader graph node
- Plug materialID (automatically deducted from GetMatchingMaterialID)
8 年前
b890244e
HDRenderLoop: Rename the directory HDRenderLoop in HDRenderPipeline
8 年前
23f2ee44
Merge pull request #71 from Unity-Technologies/Renaming-HDRenderLoop
Renaming hdrenderloop to hd renderPipeline
8 年前
782077fb
Merge branch 'master' into lowendmobile
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
8 年前
0f63e44e
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/LayeredLit/LayeredLit.shader
8 年前
66610d8f
Merge remote-tracking branch 'origin/master' into batch_rendering
# Conflicts:
# ProjectSettings/GraphicsSettings.asset
# ProjectSettings/ProjectVersion.txt
8 年前
2b3f2f91
[refactor namespace]
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering
UnityEngine.Experimental.ScriptableRenderLoop -> UnityEngine.Experimental.Rendering.{LoopName}
8 年前
4925d00e
Merge pull request #77 from Unity-Technologies/namespace-refactor
[refactor namespace]
8 年前
f38f5e1a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
c5bf4cfb
Merge branch 'master' into LayeredLit
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/Material/Lit/LitSurfaceData.hlsl
8 年前
05e84b23
Merge branch 'master' into lowendmobile
8 年前
40290c81
Merge remote-tracking branch 'origin/master' into scriptablerenderloop-materialgraph
# Conflicts:
# Assets/ScriptableRenderLoop/HDRenderPipeline/ShaderVariables.hlsl
8 年前
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 年前
c30d33b8
[Format]Reformat via format.pl to match the new conventions
7 年前
a261aadf
Merge branch 'master' into metal-ios
7 年前
06aa5d1c
Merge branch 'master' into metal
7 年前
9d4c2988
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
66e32153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into batch_rendering
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.shader
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/LitProperties.hlsl
# Assets/ScriptableRenderPipeline/HDRenderPipeline/ShaderVariables.hlsl
# Assets/TestScenes/HDTest/GlobalIlluminationTest.unity
# ProjectSettings/EditorBuildSettings.asset
# ProjectSettings/ProjectVersion.txt
# ProjectSettings/QualitySettings.asset
7 年前
3a5b105e
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
8db09493
Merge branch 'master' into shadows
7 年前
55b0257f
tabs->spaces in shader generation
7 年前
6e428acc
Merge branch 'metal' into classicDeferredMobile
7 年前
abed39d7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
aa256e25
Merge branch 'master' into shadows
7 年前
68b2246c
HDrenderPipeline: Generate hlsl debug functions
Instead of wrtiting functions by hand user can now call generated debug
function and override thing he/she want.
7 年前
a52766f1
Merge pull request #227 from Unity-Technologies/Generate-debug-hlsl-functions
HDrenderPipeline: Generate hlsl debug functions
7 年前
d82162c7
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into shadows
7 年前
42530415
Merge branch 'master'
7 年前
c31d6106
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.asset
7 年前
bb0d8e6c
Refresh assets after generating HLSL.
7 年前
b27de01a
Merge remote-tracking branch 'refs/remotes/origin/master' into Tetrahedron-encoding-for-normal
7 年前
58f36f39
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# Assets/ScriptableRenderPipeline/HDRenderPipeline/Material/Lit/Lit.hlsl
7 年前
6c224d47
Merge branch 'master'
7 年前
ad3ed427
HDRenderPipeline: Adding missing files / meta / directory
7 年前
582adf08
Merge remote-tracking branch 'origin/master' into test-framework
7 年前
3a226917
merged master
7 年前
f27d26c4
Merge branch 'master' into Branch_Batching2
# Conflicts:
# Assets/TestScenes/HDTest/NewBatcherTest.meta
7 年前
36f2d0de
Update hlsl generator for nested class and regenerate file for HD
7 年前
b81cb75f
Merge pull request #290 from Unity-Technologies/Update-hlsl-generator
Update hlsl generator for nested class and regenerate file for HD
7 年前
90e6b108
Forget hlsl generator file
7 年前
826de007
Merge pull request #291 from Unity-Technologies/Update-hlsl-generator
Update hlsl generator to C# convention
7 年前
c7e7065b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
7 年前
8b51c69a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
7 年前
d070d1b8
Merge branch 'master' into Branch_Batching2
7 年前
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
7 年前
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
7 年前
9f87b816
Remove file path header from shader generator generated files as it depends on users folder and cause conflict
7 年前
913bffab
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into Change-SSS-profile-to-16
7 年前
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 年前
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
6ddf3f73
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
9464aaa0
Organize menu items
7 年前
7e2993a1
Correct menu items that should be internal/not internal
7 年前
9a371093
Merge pull request #556 from salvadorj/organize-menu-items
Organize menu items
7 年前
1a5590ab
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# TestbedPipelines/OnTileDeferredPipeline/OnTileDeferredRenderPipeline.cs
7 年前
f052451a
merged from master
7 年前
d1c74bcb
Merge branch 'master'
7 年前
14ac0ce2
Initial work on support assembly definition files
7 年前
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 年前
3b75ece2
temp fixed include issues for some .compute shaders
added metal, smoothness to decals
7 年前
99e8024a
Fix enumeration of assembly for CsharpToHLSL
7 年前
248a47ba
Merge pull request #677 from Unity-Technologies/Fix-issue-with-AssemblyGenerator-after-Assembly-split
Fix enumeration of assembly for CsharpToHLSL
7 年前
bb73d4c6
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
10e23187
Merge branch 'master' into volume-improvements
7 年前
effdbb9c
Merge branch 'master'
7 年前
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 年前
7779e807
Merge branch 'master'
7 年前
ddeb54b6
Merge branch 'master' into LightweightPipeline
7 年前
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 年前
87c36d52
merged with master
7 年前
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 年前
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 年前
78f1ddf8
[PlanarProbe] Include custom HLSL files with shader generator
7 年前
84e022c3
Merge pull request #834 from Unity-Technologies/feature/PlanarReflection
Planar Reflection - #1 Use case Mirror
7 年前
2bae089c
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/DeferredDirectionalShadow.compute
7 年前
7e4a3052
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
fe0284c8
Merge branch 'master' into HDRP_GraphicTests
7 年前
6feb2d00
Merge remote-tracking branch 'refs/remotes/origin/master' into Updating-UI-for-material-feature-ID
7 年前
19876ed2
Merge branch 'master' into prototype/decals_gpu_optimization
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs
7 年前
c3198024
Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa
7 年前
aadc4b09
Update menu item location and label
Based on discussion with Shawn MacClelland
7 年前
803d7f40
Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction
7 年前
89a55fab
Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows
7 年前
0bfdddfc
Merge Screen Shadows
7 年前
950b560d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipelineAsset.asset
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/SubsurfaceScattering/SubsurfaceScatteringManager.cs
7 年前
83b753ad
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
7 年前
22cb3935
Merge pull request #884 from Unity-Technologies/Update-Menu-location-and-label
Update menu item location and label
7 年前
eca15a2d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-
6 年前
dd1d4224
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
6 年前
85039c4d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RTRefactoring
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugFullScreen.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
6 年前
950e29d3
Merge remote-tracking branch 'origin/master' into build/automation
6 年前
046a77ef
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
78ba9e5b
Merge master
6 年前
9801577c
Change code generation to allow multiple debug case for the same field. allow debug view normal
6 年前
2d823db6
Merge pull request #914 from Unity-Technologies/Add-normal-in-view-space-debug-mode
Change code generation to allow multiple debug case for the same field. allow debug view normal
6 年前
b1b2e631
Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing
6 年前
3174776d
Merge branch 'master' into LW-ScreenSpaceShadows
6 年前
0a72692b
Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand
6 年前
301dbf72
Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading
6 年前
75b17fab
Merge branch 'master' into decals/clustered
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/Decal.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Decal/DecalUtilities.hlsl
6 年前
070349c8
Merge branch 'master'
6 年前
a450e83a
Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2
6 年前
e768893e
Merge branch 'master'
6 年前
ea8ce865
First draft
6 年前
946c1494
Shader generation now working
6 年前
04b933d9
merged with master
6 年前
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
6 年前
51790cf9
(WIP) Added debug exposure to material debug views.
6 年前
4fbb1c4f
(wip) Added refraction model
6 年前
a2790a45
Merge pull request #1159 from Unity-Technologies/feature/RefractionModes
Screen Space Refraction Projection Model
6 年前
d61424da
Commented code specific to 4.x .NET runtime
6 年前
3320fc64
Skip in memory assemblies for the shader generator
6 年前
7a76fbbe
Merge pull request #1174 from Unity-Technologies/fix/ShaderCompilationInMemoryAssemblies
Skip in memory assemblies for the shader generator
6 年前
8d663ac4
Merge upstream/master
6 年前
5e4ad2d7
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
6 年前
4bd00e90
Merge master
6 年前
999f9fa8
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前
533beaae
Merge branch 'master' into LWRP
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 年前
16cef1a8
Update include generator to use space instead of tabs
6 年前
2ed78d94
Merge pull request #1500 from Unity-Technologies/Update-generator
Update include generator to use space instead of tabs
6 年前
c95b7c47
Merge branch 'master' into normal-buffer-support
6 年前
29ce571e
Merge branch 'master' into decals/ss3_channel_mask
6 年前
f82aef0c
Merge branch 'master' into VisualizeShadowMasks
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 年前
3a6a4e59
Merge branch 'master' into sg/spheremasknode
6 年前
4b5c5d5c
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline 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 年前
vlad-andreev
Paul Demeulenaere
Sebastien Lagarde
Evgenii Golubev
GitHub
sebastienlagarde
Julien Ignace
Felipe Lira
Arnaud Carre
Tim Cooper
Antti Tapaninen
uygar
Filip Iliescu
Torbjorn Laedre
Rune Stubbe
Robert Srinivasiah
Salvador Jacobi
Peter Andreasen
Peter Bay Bastian
Paul Melamed
Remy
Frédéric Vauchelles
John
Alex Lian
Stephane Laroche
Oliver Schnabel
Thomas
Chris Tchou
Nerites
Yao Xiaoling
Aleksandr Kirillov