Tim Cooper
d8cb658d
Initial pass at embedded gfx test framework for
8 年前
Felipe Lira
43678f6a
Fixes to TestFramework and template images added.
8 年前
Andre McGrail
e40b18e6
-Finished target texture scene
-Made templates for all test scenes so far(some incorrect :( )
8 年前
Felipe Lira
7bb7106b
Updated Template images for the camera tests in LD pipeline.
8 年前
Tim Cooper
50b5f576
[testing]Update template image
8 年前
Felipe Lira
6275e9d2
Added baked emission support to LD pipe and proper test scene
8 年前
sebastienlagarde
77c2c22a
Merge remote-tracking branch 'refs/remotes/origin/master' into Remove-Resources-folder
8 年前
Sebastien Lagarde
dee59c09
Merge branch 'master' into ssao-test
8 年前
Arnaud Carre
df0c1521
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_Batching2
# Conflicts:
# Assets/ScriptableRenderPipeline/PostProcessing
8 年前
Felipe Lira
3fc943aa
Fixed failing LD test scenes. Uploaded a new template image for baked emission scene.
8 年前
sebastienlagarde
3ccea10f
Merge branch 'master' into ssao-test
8 年前
Felipe Lira
d559f6f0
Added default materials to lightweight pipe. Changed shaders scene to add transparent, unlit and cutout.
8 年前
Evgenii Golubev
ad3d47b5
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Felipe Lira
2d2ea8bb
Added 2D Test Scene
8 年前
Evgenii Golubev
e7d27153
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop
8 年前
Filip Iliescu
dda281fd
Merge branch 'master' into classicDeferredMobile
8 年前
David Rogers
85744e59
Local merge
8 年前
David Rogers
36baac01
Revert "Local merge"
This reverts commit 05f9d2b94ae1d3a5f3e707ba4ad677e700a6fc55, reversing
changes made to f491bb59591c78736427ca92d2067f445f1630c5.
8 年前
Filip Iliescu
9c290707
merge changes from remote to local branch
8 年前
Felipe Lira
53105986
Added lightweight unlit and its shader GUI
8 年前
Julien Ignace
205fb8de
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
# Conflicts:
# Assets/ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
8 年前
Felipe Lira
0f4a886b
LightweightPipeline settings per light objects with StructuredBuffer. Right now for gles 2.0 we need an alternate solution. Added multiple point lights scene.
8 年前
sebastienlagarde
5acef24d
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-hlsl-generator
8 年前
Julien Ignace
c7e7065b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_DebugMenu2
8 年前
Arnaud Carre
d070d1b8
Merge branch 'master' into Branch_Batching2
8 年前
Evgenii Golubev
0a7924ff
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into hdrp_matrix
8 年前
Filip Iliescu
74f56073
create new branch from stable place of classicDeferredMobile and cherry pick all previous commits since history got corrupted somewhere
7 年前
Felipe Lira
0a1fead0
Fixed rendering when no lights we present in the scene. Updated test scenes and images.
7 年前
Tim Cooper
88c53704
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into reduce-gc
# Conflicts:
# Assets/ScriptableRenderPipeline/LightweightPipeline/LightweightPipeline.cs
7 年前
Arnaud Carre
e9b3071e
Merge branch 'master' into Branch_Batching2
7 年前
Evgenii Golubev
5570c647
Merge branch 'master'
7 年前
Filip Iliescu
cd024be6
Merge branch 'master' into OnTileDeferred
7 年前
Felipe Lira
ee1ea198
Added some test scenes to lightweight pipeline. Fixed the multiple point lights test scene.
7 年前
Felipe Lira
9c00a86c
Merge branch 'LightweightPipeline'
# Conflicts:
# Assets/Tests/GraphicsTests/RenderPipeline/LightweightPipeline/Scenes/Shaders/StandardBlinnPhongShader/LightweightLights.unity
7 年前
Felipe Lira
a6a01a17
Fixed merge errors in the scene lightweight lights scene.
7 年前
Felipe Lira
6d592a3d
Merge branch 'master' into LightweightPipeline
7 年前
Peter Bay Bastian
d6b8a7e5
Change root of repository to Assets/
7 年前
Evgenii Golubev
4898d174
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into volumetrics
7 年前
Felipe Lira
a2c2ce7f
Merge branch 'master' into LightweightPipeline
7 年前
Felipe Lira
bc3f5b1a
Fixed SpriteDemo test scene that was failing due to a diff in background color in the scene.
7 年前
Felipe Lira
457b3a17
Renamed test scenes to use XXX-TestScene name standard. Added test scene assets to each folder.
7 年前
Felipe Lira
605dc966
Fixed most of the lightweight graphics tests.
7 年前
Felipe Lira
70a982f2
There's one artifact in the emission baking that is also happening in the legacy pipe. For now uploading this image test to be able to check that all tests are running properly.
7 年前
Andre McGrail
64797a02
Updated Lightweight tests and created template images
7 年前
Andre McGrail
1badfd13
Added image template preprocessor to avoid compressing any reference images from the tests
Added missing meta files
7 年前
Andre McGrail
c844ad5d
Added tests:
023_Lighting_Mixed: tests mixed light modes(broken right now)
024_Shader_PBRvalidation: Contains adam and some test spheres, original template made against legacy pipe
General clean up of other tests
7 年前
Andre McGrail
a21b0c40
Created both Metallic and Specular PBR validation scenes with template image done in legacy pipe.
7 年前
Andre McGrail
32f08396
Added PBR material test scene, has a wide variety of different surfaces. Template image created in legacy pipe, may never pass as the shadows will always be out..
7 年前
Andre McGrail
e4557fc9
Removed shadows from LW test 026
7 年前
Andre McGrail
7d2e6fd9
Test 026 Template image fix
7 年前
Peter Andreasen
a2e029a1
merge with master + a few samplegame fixes
7 年前
Felipe Lira
af290f39
Fixed scene 012 template and materials.
7 年前
Felipe Lira
ce712ae5
Fixed tests and templates to account for LDR rendering.
7 年前
Felipe Lira
4bf2abf5
Merge branch 'LightweightPipeline'
7 年前
sebastienlagarde
8f8eb990
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-shader-pass
7 年前
Felipe Lira
e60bad0c
026 template image verified with simplified ggx / visibility / fresnel
7 年前
Felipe Lira
c5450cac
Fixed glossy env color from ambient probe. Added gfx tests 31-34 to test various setup of SH/Lightmap with different ambient sources.
7 年前
Peter Andreasen
c62bfeca
Merged with master
7 年前
Felipe Lira
0afc0404
Fixed emission property on SimpleLightingShader. Removed Env mapping support for consistency with old legacy shader library.
7 年前
Felipe Lira
f01f666d
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
GitHub
0742fb7a
Merge pull request #413 from Unity-Technologies/Unity-2017.3
Merge Unity 2017.3 to master
7 年前
Felipe Lira
d1cf8765
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
GitHub
a82f6ffc
Merge pull request #421 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Andre McGrail
c6969950
Added Custom post to have both before transparent and before stack. Created reference image for Postprocessing test
7 年前
Peter Andreasen
867c8236
Merge remote-tracking branch 'origin/master' into sample_game
7 年前
Julien Ignace
674d0efe
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into culling
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
7 年前
Felipe Lira
263a503c
Added terrain shaders test
7 年前
Julien Ignace
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 年前
GitHub
bd071d2c
Merge pull request #515 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Robert Srinivasiah
7998bfa7
Merge remote-tracking branch 'origin/master' into xr-hdrp
7 年前
Felipe Lira
27111431
Added support to directional lightmaps.
7 年前
Andre McGrail
ba821dcf
Updated and cleaned all LW pipe tests and re-created template images
7 年前
Andre McGrail
2e3bce5f
Switched terrain scene over to the Lightweight shader
Added meta files
7 年前
Andre McGrail
c06a72c0
Tweaks to existing tests
Setup both particle tests(29 & 37) to work in the edit mode test
7 年前
Sebastien Lagarde
a4fddf9c
Merge remote-tracking branch 'refs/remotes/origin/Unity-2017.3' into YibingProject
7 年前
Andre McGrail
8b5b9ea5
Added test 041_Lighting_BasicArea for area light
7 年前
Sebastien Lagarde
36f3cfd4
merge unity 2017.3
7 年前
Peter Andreasen
f052451a
merged from master
7 年前
Felipe Lira
04829cba
Merge branch 'LightweightPipeline' into Unity-2017.3
7 年前
Felipe Lira
1531aa64
Renamed/Moved test 037 files to avoid windows path character limit.
7 年前
Felipe Lira
ed1d3a8f
Merge branch 'Unity-2017.3' into LightweightPipeline
7 年前
GitHub
62808466
Merge pull request #585 from Unity-Technologies/Unity-2017.3
Unity 2017.3
7 年前
Felipe Lira
42e09fc5
Added correct template images for test scenes.
7 年前
Evgenii Golubev
d1c74bcb
Merge branch 'master'
7 年前
Julien Ignace
0a60dd2a
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs
7 年前
GitHub
45f497ea
Merge pull request #593 from Unity-Technologies/LightweightPipeline
Lightweight pipeline
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 年前
Peter Andreasen
5d36f104
Merged master
7 年前
Felipe Lira
18e0d6e8
Merge branch 'Unity-2017.3'
7 年前
Evgenii Golubev
7b797ff7
Merge branch 'master'
7 年前
Peter Bay Bastian
85e38a3c
Merge branch 'master' into shader-include-paths-2
7 年前
sebastienlagarde
267328a0
Pushing auto-updated meta file
7 年前
Evgenii Golubev
6be2053b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Felipe Lira
2387e5a5
Added GI to unlit standard shader.
7 年前
Frédéric Vauchelles
fe773302
Merge master
7 年前
Remy
39c80121
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
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 年前
GitHub
b13cc702
Merge pull request #612 from Unity-Technologies/feature/realtimeCubemap
Feature/realtime cubemap
7 年前
Remy
c22205d7
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Evgenii Golubev
8ee2d44f
Merge 'master'
7 年前
Sebastien Lagarde
db77157f
Update meta
7 年前
Evgenii Golubev
228fd56b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
Remy
5b6ad5e8
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Frédéric Vauchelles
6541de0b
Merge master
7 年前
Peter Andreasen
b6423cf9
merge
7 年前
Robert Srinivasiah
ea2646a5
Merge remote-tracking branch 'origin/master' into xr-hdrp_options
Merge conflicts had to do with moved RenderingDebugSettings and TilePass->LightLoop rename
7 年前
Felipe Lira
c62e8861
Refactored upgraders. Added Terrain and Particles upgraders.
7 年前
sebastienlagarde
f142c657
Merge remote-tracking branch 'refs/remotes/origin/master' into Support-forward-SSS
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
# ScriptableRenderPipeline/HDRenderPipeline/Lighting/LightLoop/LightLoop.cs
7 年前
sebastienlagarde
f3d7f5bf
Address feedback
7 年前
GitHub
b04739d1
Merge pull request #641 from Unity-Technologies/Support-forward-SSS
Add support for forward sss
7 年前
Felipe Lira
44b0d028
Fixed spot shadows. Updated template scenes to account for the new shadow filtering.
7 年前
Julien Ignace
256c35aa
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume
# Conflicts:
# ScriptableRenderPipeline/HDRenderPipeline/HDRenderPipeline.cs
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 年前
Remy
5d52724a
Merge remote-tracking branch 'origin/master' into HDRP-GraphicTests
7 年前
Andre McGrail
8752dc7f
Updated/Added Lightweight pipe tests, created templates
7 年前
sebastienlagarde
c9ee9e33
Merge remote-tracking branch 'refs/remotes/origin/master' into add-xbone-one-support
7 年前
Evgenii Golubev
81d62eb8
Merge branch 'master'
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 年前
Andre McGrail
0effa5f2
Removed substance dependancies from LW tests and also re-created affected template images
7 年前
Andre McGrail
6d8f7475
Added missing metas and updated mats that source tree didn’t pickup :(
7 年前
Sebastien Lagarde
9fe83875
Update various meta that seems to not be uptodate
7 年前
Sebastien Lagarde
5f2183f6
Merge remote-tracking branch 'refs/remotes/origin/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 年前
Evgenii Golubev
78563feb
Merge branch 'master'
7 年前
GitHub
1b90eb6b
Merge pull request #687 from Unity-Technologies/LightweightPipeline
Lightweight pipeline upgrade to SRP shader library
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 年前
Julien Ignace
65bd8e1d
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride
7 年前
Frédéric Vauchelles
e239e312
Merge branch 'master' into feature/ReflectionProbeEditor
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 年前
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 年前
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 年前
Felipe Lira
9ab6af9c
Fixed scene for test 010. Updated template of scene 039 to account for the new spotlight falloff.
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 年前
Felipe Lira
1f07c2da
Updated scenes and templates to account for new shadow bias algorithm.
7 年前
sebastienlagarde
8e74657a
Merge remote-tracking branch 'refs/remotes/origin/master' into Convert-shaderLibrary-to-half-float-support
7 年前
Sebastien Lagarde
24ac5a9e
Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat
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 年前
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 年前
Peter Andreasen
3ccf74cc
merged from master
7 年前
John
cf25c602
Merge master
7 年前
Kay Chang
53b01e3a
WIP adding Switch support.
7 年前
Kay Chang
f5303717
Revert "WIP adding Switch support."
This reverts commit 9af0c8f34d9c5f809e96bd5f5502d6ac28b1f330.
7 年前
Remy
bbba671d
Update meta files
7 年前
GitHub
d5cc7395
Merge pull request #1251 from Unity-Technologies/HDRP_GraphicTests
Hdrp graphic tests
7 年前
Evgenii Golubev
9b95d6ea
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
7 年前
sebastienlagarde
0f054e4d
HDRP: added few #if UNITY_2018_2_OR_NEWER to compile code on 2018.1 + update meta
7 年前
GitHub
4d8b50e4
Merge pull request #1256 from Unity-Technologies/Update-code-with-define-to-work-on-2018.1
Update code with define to work on 2018 1
7 年前
sebastienlagarde
e03580d8
Merge remote-tracking branch 'refs/remotes/origin/master' into 2018.1-experimental
7 年前
Frédéric Vauchelles
8676f2e5
Merge master
7 年前
Felipe Lira
533beaae
Merge branch 'master' into LWRP
7 年前
sebastienlagarde
f5c6eec7
Merge remote-tracking branch 'refs/remotes/origin/master' into 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 年前
Yao Xiaoling
cb671fbb
Merge remote-tracking branch 'remotes/origin/master' into gpu_terrain
7 年前
sebastienlagarde
5f36d9bb
Update meta file to 2018.2 version
7 年前
Stephane Laroche
c551dc12
Merge branch 'master' into stacklit
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 年前
Evgenii Golubev
1f059c6b
Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline
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 年前