Frédéric Vauchelles
|
5d1e46bc
|
Moved CoreRP files in folders for readbility
|
6 年前 |
GitHub
|
b782fae4
|
Merge pull request #1142 from Unity-Technologies/feature/RefactorCoreRPFiles
Refactor CoreRP root files
|
6 年前 |
|
Frédéric Vauchelles
|
412bd010
|
Merge master
|
6 年前 |
Stephane Laroche
|
5ad6a9db
|
Merge branch 'master' into StackLitWork
|
6 年前 |
|
Frédéric Vauchelles
|
7a47594e
|
Updated RTHandle class to an instance class
|
6 年前 |
|
Frédéric Vauchelles
|
70ed0378
|
wip buffered RTHandle system for cameras
|
6 年前 |
|
Frédéric Vauchelles
|
ca61ff42
|
Updated beffered RTHandle system
|
6 年前 |
Evgenii Golubev
|
8d663ac4
|
Merge upstream/master
|
6 年前 |
|
Frédéric Vauchelles
|
12acef66
|
Fixed history buffer binding
|
6 年前 |
Paul Melamed
|
5e4ad2d7
|
Merge branch 'master' into decals/texture_atlas
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs
|
6 年前 |
Felipe Lira
|
65fc1c54
|
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/GettingStarted2.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader1.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader10.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader11.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader12.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader13.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader14.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader15.png.meta
# ScriptableRenderPipeline/HDRenderPipeline/Documentation/Images/LitShader16.png.meta
# ScriptableRe...
|
6 年前 |
|
Evgenii Golubev
|
999f9fa8
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
Remy
|
256e6c9c
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/Materials/PreRefractionPassTester.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/SkySettings/HDRP_Default_Sky.asset
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction.unity
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_HiZ.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_NM_Thickness.mat
# Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/1xxx_Materials/1205_Lit_Transparent_Refraction/Lit_Refraction_Plane_Proxy.mat.meta
# Tests/GraphicsTests/RenderPip...
|
6 年前 |
|
Frédéric Vauchelles
|
e98f1b57
|
Updated RTHandle class to an instance class
|
6 年前 |
|
Frédéric Vauchelles
|
e97721e9
|
wip buffered RTHandle system for cameras
|
6 年前 |
|
Frédéric Vauchelles
|
c65c8258
|
Updated beffered RTHandle system
|
6 年前 |
|
Frédéric Vauchelles
|
32f00e77
|
Fixed history buffer binding
|
6 年前 |
|
Frédéric Vauchelles
|
3eb55fa2
|
Some fixes of RTHandleSystem
|
6 年前 |
|
GitHub
|
4a9bfb82
|
Merge pull request #1230 from Unity-Technologies/feature/BufferedRTHistoryPerCamera
Buffered RT History per camera
|
6 年前 |
|
Remy
|
9c81e0d8
|
Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests
# Conflicts:
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1101_Unlit.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1301_SubSurfaceScattering.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1302_SSS_MaxRadius.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/1xxx_Materials/1303_SSS_Pre-Post.unity.png.meta
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2102_GI_Emission.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2103_BakeMixed.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/2xxx_Lighting/2401_Light_on_Tesselation.unity.png
# ImageTemplates/HDRenderPipeline/Scenes/9xxx_Other/9002_Deferr...
|
6 年前 |
Tim Cooper
|
143fcc5f
|
Tizen not supported on 18.2+
|
6 年前 |
|
Frédéric Vauchelles
|
d9f5b4f5
|
Merge branch 'master' into feature/SSR
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Textures/RTHandleSystem.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Camera/HDCamera.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDUtils.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/RenderPipelineResources/BufferPyramid.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyManager.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Sky/SkyRenderingContext.cs
|
6 年前 |
|
GitHub
|
d0d3cc67
|
Merge pull request #1240 from Unity-Technologies/tizen-warning-fix
Tizen not supported on 18.2+
|
6 年前 |
|
Frédéric Vauchelles
|
65bdc3e4
|
Cleaning in BufferedRTHandleSystem
|
6 年前 |
|
Frédéric Vauchelles
|
a7658549
|
Various fixes
|
6 年前 |
|
Frédéric Vauchelles
|
dd12e0c4
|
Added comments
|
6 年前 |
|
Frédéric Vauchelles
|
2e984cbd
|
Added comments
|
6 年前 |
|
Evgenii Golubev
|
9b95d6ea
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
GitHub
|
263cdb82
|
Merge pull request #1245 from Unity-Technologies/feature/BufferHistoryUpdate
Cleaning in BufferedRTHandleSystem
|
6 年前 |
sebastienlagarde
|
0b448138
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
|
Frédéric Vauchelles
|
8676f2e5
|
Merge master
|
6 年前 |
|
Felipe Lira
|
533beaae
|
Merge branch 'master' into LWRP
|
6 年前 |
|
Evgenii Golubev
|
32c0fc42
|
Port integral and density buffers to the RTHandle system
|
6 年前 |
|
Evgenii Golubev
|
f1877508
|
Update GetRenderTargetAutoName() to support volume textures
|
6 年前 |
|
sebastienlagarde
|
f5c6eec7
|
Merge remote-tracking branch 'refs/remotes/origin/master' into switch_support
|
6 年前 |
|
Stephane Laroche
|
10f8090a
|
Merge branch 'stacklit' into stacklit_vl_merge
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/ShaderLibrary/BSDF.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/StackLit/StackLitUI.cs
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.hlsl
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLit.shader
# ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/StackLit/StackLitData.hlsl
|
6 年前 |
Yao Xiaoling
|
cb671fbb
|
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
|
6 年前 |
Raymond Graham
|
4e9dca70
|
Merge branch 'master' into volumetric-lighting-updates
|
6 年前 |
|
GitHub
|
c3aaee56
|
Merge pull request #1302 from EvgeniiG/master
Move the Volumetric Lighting system to the RTHandle system
|
6 年前 |
|
sebastienlagarde
|
05ee75ca
|
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
|
6 年前 |
|
sebastienlagarde
|
395a7a89
|
Update UI of resolution of cookie and reflection
Use combo box now
|
6 年前 |
|
GitHub
|
e798a2c3
|
Merge pull request #1313 from Unity-Technologies/Update-UI-of-resolution-of-cookie-and-reflection
Update ui of resolution of cookie and reflection
|
6 年前 |
|
Stephane Laroche
|
e0b3d217
|
Merge branch 'master' into stacklit
|
6 年前 |
|
sebastienlagarde
|
64f35bd6
|
Merge remote-tracking branch 'refs/remotes/origin/master' into sg/move-repository
|
6 年前 |
|
Felipe Lira
|
25e45b36
|
Merge branch 'master' into LWRP
# Conflicts:
# ScriptableRenderPipeline/Core/CoreRP/Utilities/CoreUtils.cs
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
6 年前 |
|
Felipe Lira
|
63a6fe03
|
Merge branch 'LWRP' into lw/api-refactor-v1
# Conflicts:
# ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs
|
6 年前 |
|
Evgenii Golubev
|
1f059c6b
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
|
6 年前 |
|
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
|
6 年前 |
|
Tim Cooper
|
fafb59af
|
Run code formatter.
|
6 年前 |
|
Frédéric Vauchelles
|
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 年前 |
|
sebastienlagarde
|
67c1ca49
|
Remove UNITY_2018_2_OR_NEWER define (as we are on 2018.2)
|
6 年前 |
|
GitHub
|
7914a34a
|
Merge pull request #1407 from Unity-Technologies/remove-UNITY_2018_2_OR_NEWER
Remove UNITY_2018_2_OR_NEWER define (as we are on 2018.2)
|
6 年前 |
|
Yao Xiaoling
|
7ba05ba9
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain. Will fix merge afterwards.
|
6 年前 |
Aleksandr Kirillov
|
4695f235
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
Antoine Lelievre
|
8012ce85
|
Added a warning for 128x128 cookie texture without mipmaps
|
6 年前 |
|
GitHub
|
50098f9d
|
Merge pull request #1782 from Unity-Technologies/WarningForCookieWithoutMipmap
Added a warning for 128x128 cookie texture without mipmaps
|
6 年前 |
|
sebastienlagarde
|
10164527
|
Merge branch 'HDRP/staging' into HDRP/refactor-reflectionProbe/clean-proxy-volume
|
6 年前 |
|
GitHub
|
de2e6ea2
|
Merge pull request #1783 from Unity-Technologies/HDRP/staging
merge Hdrp/staging
|
6 年前 |
|
Antoine Lelievre
|
71ec7369
|
Merge HDRP/staging
|
6 年前 |
|
Remy
|
b364cfd3
|
Merge branch 'hdrp/staging' into tests/hdrp/distortion
|
6 年前 |
|
Antoine Lelievre
|
d5938a0f
|
Fixed TextureCache2D for RenderTextures
|
6 年前 |
|
Yao Xiaoling
|
a11976bf
|
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into gpu_terrain
|
6 年前 |
|
GitHub
|
f33cccee
|
Merge pull request #1810 from Unity-Technologies/FixTextureCacheMipmapWarningForPlanarReflection
Fixed TextureCache2D mipmap check for RenderTextures
|
6 年前 |
|
Antoine Lelievre
|
c5cac258
|
Merge HDRP/staging
|
6 年前 |
|
GitHub
|
b400b1c1
|
Merge branch 'master' into lw/terrain_optimization
|
6 年前 |
|
GitHub
|
10b216d9
|
Merge pull request #1825 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
Sebastien Lagarde
|
72141169
|
Merge branch 'master' into lighting-arealigh-fixup
|
6 年前 |
|
GitHub
|
01fdbb38
|
Merge branch 'master' into fix/coupling-hdlight-workflow
|
6 年前 |
Julien Ignace
|
5c5547e8
|
Removed a bunch of GC.Alloc each frame.
|
6 年前 |
|
Paul Melamed
|
9dbd8998
|
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
# Conflicts:
# com.unity.render-pipelines.high-definition/CHANGELOG.md
# com.unity.render-pipelines.high-definition/HDRP/RenderPipelineResources/RenderPipelineResources.cs
|
6 年前 |
|
GitHub
|
e5d59bcd
|
Merge pull request #1864 from Unity-Technologies/HDRP/fix-gcalloc
Removed a bunch of GC.Alloc each frame.
|
6 年前 |
|
Paul Melamed
|
f1d163d5
|
Merge branch 'HDRP/staging' into HDRP/decals/v2_1/normal_buffer
|
6 年前 |
|
GitHub
|
3e6c15b0
|
Merge pull request #1870 from Unity-Technologies/HDRP/staging
Merge Hdrp/staging
|
6 年前 |
Yao Xiao Ling
|
cfd45cf1
|
Merge remote-tracking branch 'remotes/origin/master' into gpu-terrain
|
6 年前 |
|
sebastienlagarde
|
38a3e185
|
Merge branch 'master' into HDRP/add-LightLayer-in-probes
|
6 年前 |
egomeh
|
e7c59a70
|
Resolve merge conflicts
|
6 年前 |
|
GitHub
|
7cfc2ed0
|
Merge branch 'master' into sg/fix-for-saving-dirty-shader-graph
|
6 年前 |
Thomas
|
7ffc71c9
|
First pass at refactoring and speeding up depth & color pyramids
|
6 年前 |
|
GitHub
|
1d71d3d6
|
Merge pull request #1904 from Unity-Technologies/pyramid-rework
Pyramid rework
|
6 年前 |
|
GitHub
|
dbde5edb
|
Merge branch 'master' into gpu-terrain
|
6 年前 |
|
GitHub
|
aae1a458
|
Merge branch 'master' into lw/no_front_to_back_sorting_of_opaques_on_gpu_with_hsr
|
6 年前 |
