目录树: 56786b4c

/main

/scriptablerenderloop-materialgraph

/batch_rendering

/vr_sandbox

/Branch_Batching2

/mikko-renderpass

/fptl_cleanup

/vr_fptl_sandbox

/Branch_batcher

/MobileDeferredRenderPass

/vr_api_testbed

/RenderPassXR_Sandbox

/classicDeferredMobile

/EnableVulkanAndES3

/OnTileRenderPass2

/sample_game

/culling

/OTDRP-develop

/Add-support-for-light-specular-color-tint

/stochastic_alpha_test

/Yibing-Project-2

/xr-hdrp-rt-test

/system-shock-transitional-shader

/feature-runtimeTextureCache

/shader-library-include-paths

/asmdef

/namespace

/feature-ReflectionProbeFit

/prototype-decals

/DrawSettings

/projects-TheLastStand

/iridesence

/lw-nolightlist

/Add-physical-light-unity-support

/LightweightPipelineExperimental

/switch_support

/feature-ScreenSpaceProjection

/use-roughness

/LW-BakedIndirect

/Branch_FixObjectMotion

/srp_batcher

/LW-LightOptimizations

/Branch_ScriptableCulling

/LW-LowEnd

/feature-ReflectionProbeBaking

/Improve-shader-generator

/improve-shader-generator-data

/2018.1

/lwr-xr-shader-fixes-sandbox

/uifoldout-fix

/lw-callbacktests

/lwrp-xr-sssm-DrawProc

/lwrp-xr-tim-hacks

/ss3HDRP

/build-automation

/HDRP_SurfaceShader

/tag-1.1.0-beta

/xr-hdrp-pyramids

/lw-bias_per_cascade

/040SimpleLighting

/lw-tangentspacelightingtest

/Lux-for-HDRI

/HDRP_GraphicTests

/projects-system-shock-2018.1

/Change-cluster-Tile-to-dynamic-branch

/Reduce-shader-variant

/lw-shadow-optimization

/LW-DistortionPass

/lw-shader-optimization

/Branch_RemoveCascadeBordersInUI

/Branch_EnableLastSplitFade

/Branch_DebugExposure

/Documentation

/lw-bugfixes

/Branch_DebugExposure2

/Branch_DebugWindowFix

/lw-shadow-keyword

/backport-shader-optimization

/tag-1.1.4-preview

/StackLitWork

/tag-1.1.5-preview

/tag-1.1.6-preview

/stacklit

/StackLit2

/hdrp-staging

0.1.21

0.1.27

0.1.28

0.1.34

1.0.0-beta

1.0.1-beta

1.1.0-beta

1.1.1-preview

1.1.2-preview

1.1.4-preview

1.1.5-preview

1.1.6-preview

2018.1.0f2

SRP_0.1.25

Unity-2017.3.0b10

Unity-2017.3.0b2

Unity-2018.1.0b13

Unity-2018.1.0b2

Unity-2018.1.0b6

Unity-2018.1.0b8

unity-2017.1

unity-2017.1b5

unity-2017.2b4

unity-2017.3.0b1

unity-2018.1.0b13

unity-5.6.0b1

unity-5.6.0b10

unity-5.6.0b5

分支列表 标签列表

${ item.name }

创建分支 ${ searchTerm }

从 '56786b4c'

${ noResults }

286 次代码提交 (56786b4c-3321-422b-9786-a0e7c96c8b11)

作者	SHA1	备注	提交日期
Remy	1c153ebd	Cleanup for new HDRP Tests	7 年前
Remy	f1183b3e	Start making the first graphic test scene.	7 年前
Remy	327d893f	Graphic Tests for Unlit with Distortion	7 年前
Remy	ac7b11a2	Finished Unlit Graphic Tests. Start Lit.	7 年前
Remy	60d8dff1	Graphic tests for Lit Transparent and Details parameters	7 年前
Remy	bf0e0adc	Add graphic test image templates for the current graphi tests	7 年前
Remy	79e20a34	Move objects in Transparent Fog to have better focus.	7 年前
Remy	f10c7c9d	Add a complex material with different surface properties in the mask textures.	7 年前
Remy	fc3e1073	Add Lit Refractions Tests	7 年前
Remy	962d6e55	Add lit refraction graphic test template	7 年前
Julien Ignace	b431be32	Fixed all tests Unlit materials after property renaming.	7 年前
GitHub	2c30320a	Merge pull request #541 from Unity-Technologies/Branch_FixUnlitMaterialTests Fixed all tests Unlit materials after property renaming.	7 年前
Remy	61dcebc6	Fix position of material previews in Unlit scene.	7 年前
GitHub	29c37ab8	Merge pull request #542 from Unity-Technologies/Unity-2017.3 Unity 2017.3	7 年前
GitHub	65734261	Merge pull request #543 from Unity-Technologies/Branch_FixUnlitMaterialTests Fix position of material previews in Unlit scene.	7 年前
sebastienlagarde	5cd63d12	Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3	7 年前
GitHub	232486c8	Merge pull request #544 from Unity-Technologies/Reorganize-HDRP-GraphicTests Reorganize hdrp graphic tests	7 年前
GitHub	b6cf8abe	Merge pull request #549 from Unity-Technologies/Unity-2017.3 Unity 2017.3	7 年前
Remy	b3864496	Add Distortion tests	7 年前
Remy	3ca3520e	Cleanup distortion test ressource Update test templates Start Distortion test Scene.	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 年前
Sebastien Lagarde	36f3cfd4	merge unity 2017.3	7 年前
GitHub	4225bc5a	Merge pull request #568 from Unity-Technologies/HDRP-GraphicTests Hdrp graphic tests	7 年前
Julien Ignace	220e0aff	Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Unity-2017.3	7 年前
Remy	d9e98851	Update distortion graphic test before PR.	7 年前
GitHub	9ef5873f	Merge pull request #571 from Unity-Technologies/Unity-2017.3 Unity 2017.3	7 年前
GitHub	1e128d62	Merge pull request #576 from Unity-Technologies/HDRP-GraphicTests Update distortion graphic test before PR.	7 年前
Evgenii Golubev	6cea0d27	Merge branch 'Unity-2017.3' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into Unity-2017.3	7 年前
Evgenii Golubev	fdcd7680	Merge branch 'Unity-2017.3' of https://github.com/EvgeniiG/ScriptableRenderLoop into volumetrics	7 年前
GitHub	85aac6a7	Merge pull request #577 from Unity-Technologies/Unity-2017.3 Unity 2017.3	7 年前
Remy	a69c5c73	Finished Distortion features tests	7 年前
GitHub	efed95fd	Merge pull request #579 from Unity-Technologies/HDRP-GraphicTests Finished Distortion features tests	7 年前
GitHub	62808466	Merge pull request #585 from Unity-Technologies/Unity-2017.3 Unity 2017.3	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 年前
Peter Andreasen	5d36f104	Merged master	7 年前
Remy	3099539f	Add displacement graphic test. Update HDRP graphic test template images.	7 年前
GitHub	13a468ea	Merge pull request #599 from Unity-Technologies/HDRP-GraphicTests Add displacement graphic test.	7 年前
Remy	cd0989fe	Add Pixel/Vertex displacement specific graphic tests	7 年前
Evgenii Golubev	e84fe4b6	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	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 年前
Remy	515bdee8	Add missing graphic test image templates	7 年前
GitHub	61fde733	Merge pull request #611 from Unity-Technologies/HDRP-GraphicTests Hdrp graphic tests	7 年前
Julien Ignace	6145dbe8	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into feature/realtimeCubemap	7 年前
Remy	de58d455	Add Lit BentNormal Test scene	7 年前
GitHub	af3e20a0	Merge pull request #617 from Unity-Technologies/HDRP-GraphicTests Hdrp graphic tests	7 年前
Evgenii Golubev	aa8b5a9c	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	7 年前
Remy	539d3115	Add detail mask test in lit_features	7 年前
Evgenii Golubev	8ee2d44f	Merge 'master'	7 年前
Remy	a347dad5	Add Lit Detail and Emission graphic tests	7 年前
GitHub	da3dc10a	Merge pull request #623 from Unity-Technologies/HDRP-GraphicTests Hdrp graphic tests	7 年前
Julien Ignace	92a18712	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_RenameTilePass # Conflicts: # SampleScenes/HDTest/GraphicTest/RealtimeCubemaps/LightingData.asset # SampleScenes/HDTest/GraphicTest/RealtimeCubemaps/ReflectionProbe-1.exr # SampleScenes/HDTest/GraphicTest/RealtimeCubemaps/ReflectionProbe-2.exr # ScriptableRenderPipeline/HDRenderPipeline/Debug/DebugDisplay.cs # ScriptableRenderPipeline/HDRenderPipeline/Lighting/TilePass/TilePass.cs	7 年前
Evgenii Golubev	228fd56b	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	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	e45df6b6	Merge branch 'master' into LightweightPipeline	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 年前
Evgenii Golubev	81d62eb8	Merge branch 'master'	7 年前
sebastienlagarde	2c9bfb4e	HDRenderPipeline: fix all material in current project	7 年前
GitHub	fc5778fa	Merge pull request #655 from Unity-Technologies/Fix-all-material-in-project HDRenderPipeline: fix all material in current project	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 年前
Evgenii Golubev	7106bb0a	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into volumetrics	7 年前
sebastienlagarde	c963e81c	HDRenderPipeline: Update graphic test refraction	7 年前
GitHub	1c78cd78	Merge pull request #664 from Unity-Technologies/Update-Refraction-test HDRenderPipeline: Update graphic test refraction	7 年前
Raymond Graham	1118c956	Merge branch 'master' into motionVectorSupport	7 年前
Julien Ignace	7faea4fc	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkySettingsVolume # Conflicts: # PostProcessing	7 年前
Evgenii Golubev	c16681df	Merge branch 'master'	7 年前
Evgenii Golubev	a2e010cc	Fix failing test	7 年前
Remy	5cb1a76e	Add missing meta file. Fix scenes material in Lit_Transparent scene.	7 年前
GitHub	d2a4e002	Merge pull request #681 from Unity-Technologies/HDRP-GraphicTests Hdrp graphic tests Update	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	7779e807	Merge branch 'master'	7 年前
Felipe Lira	ddeb54b6	Merge branch 'master' into LightweightPipeline	7 年前
Julien Ignace	ab2b8608	Updated all HDRP test scenes with new sky volumes (until they work in prefabs and we can share them... in 2018.2 hopefully)	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	75d76261	Merge pull request #692 from Unity-Technologies/Branch_SkySettingsVolume Refactor of sky and fog to use interpolation volumes.	7 年前
sebastienlagarde	cfa07646	Merge branches 'master' and 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	7 年前
Evgenii Golubev	78563feb	Merge branch 'master'	7 年前
sebastienlagarde	2b24ec8c	Update all material	7 年前
GitHub	7ab47949	Merge pull request #696 from Unity-Technologies/add-versionning-on-additonal-data Add versionning on additonal data	7 年前
Frédéric Vauchelles	ac97e406	Merge branch 'master' into feature/ReflectionProbeEditor	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 年前
Sebastien Lagarde	b1d9e7b9	Update Graphic test with only Mirror and None	7 年前
GitHub	1dff3972	Merge pull request #717 from Unity-Technologies/Remove-None-mode-of-double-sided Remove none mode of double sided	7 年前
Sebastien Lagarde	c2606939	Fix refraction and distortion test	7 年前
Julien Ignace	f6a78dc5	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_SkyLightingOverride # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/LightLoop/LightLoop.cs	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 年前
Remy	02d89c04	Try to correct the unlit test scene : removed blend multiply materials	7 年前
GitHub	bd3a6508	Merge pull request #746 from Unity-Technologies/HDRP-GraphicTests Add shadow masks test, and correct the unlit test scene.	7 年前
sebastienlagarde	5ca40e6e	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	7 年前
Sebastien Lagarde	cd92c7dc	Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat	7 年前
Frédéric Vauchelles	ad68db51	Merge branch 'master' into feature/HDCameraEditor	7 年前
Thomas	f101d51c	Updated gfx tests	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 年前
GitHub	77906a48	Merge pull request #752 from Unity-Technologies/volume-asset-switch Changed the volume framework to use disk-based assets	7 年前
Evgenii Golubev	c86b3214	Merge branch 'master'	7 年前
Sebastien Lagarde	61c2e24d	Merge remote-tracking branch 'refs/remotes/origin/master' into Update-ClearCoat	7 年前
Julien Ignace	a95ec526	- Changed the way baking sky works (because it was broken with interpolation volumes becoming assets). It's now a dedicated component instead of a flag in a SkySettings - Updated all test scenes accordingly - Specified the right RenderPipeline on all our test scenes cameras.	7 年前
GitHub	af279262	Merge pull request #765 from Unity-Technologies/Branch_FixBakingSky Fixed baking sky after last interpolation volume upgrade	7 年前
Julien Ignace	05efe29c	Updated Heightmap parametrization and converted all HDRP materials.	7 年前
Evgenii Golubev	7e74580b	Merge branch 'master'	7 年前
Evgenii Golubev	8a70dc3b	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	7 年前
sebastienlagarde	3ba5f5fc	Merge remote-tracking branch 'refs/remotes/origin/master' into Refactor-GBuffer-with-material-feature	7 年前
sebastienlagarde	2fd0a788	HDRenderPipeline: Update all materials	7 年前
GitHub	fbce26f6	Merge pull request #770 from Unity-Technologies/update-all-materials HDRenderPipeline: Update all materials	7 年前
Frédéric Vauchelles	790cee43	Merge branch 'master' into feature/PlanarReflection # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Material/Lit/Lit.hlsl	7 年前
Sebastien Lagarde	f97342c5	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug	7 年前
lyndon homewood	ef4b0aa9	Merge branch 'feature/mip-debug' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into feature/mip-debug	7 年前
Julien Ignace	43f6d6eb	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_HeightMapParametrization # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Editor/Material/Lit/BaseLitUI.cs # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Planar.mat # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Checker_Triplanar.mat # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/2xxx_Lighting/2101_GI_Metapass/Lit_Green_CheckerAlphaCutout.mat	7 年前
Remy	468b92e2	Move back play mode testrunner script out of Editor Folder, and add compilation directives to avoir build failures. Fix script GUID in LT and HD test scenes.	7 年前
GitHub	544aba56	Merge pull request #777 from Unity-Technologies/Branch_HeightMapParametrization Updated Heightmap parametrization and converted all HDRP materials.	7 年前
GitHub	b8348971	Merge pull request #781 from Unity-Technologies/PlayMode_Tests_and_Build_Fix Fix Fix for playmode tests (no more build failure)	7 年前
Thomas	4b33a1b6	Merge branch 'master' into lw-gc-optim	7 年前
Julien Ignace	6ba9292e	Revered matrerial update after heightmap parametrization change.	7 年前
Julien Ignace	cdd44d73	Re-updated materials with new heightmap parametrization	7 年前
Remy	bfbb6604	Remove multiplicative blend mode from tests.	7 年前
sebastienlagarde	7f5f1c1a	Merge remote-tracking branch 'refs/remotes/origin/master' into feature/mip-debug	7 年前
GitHub	37a266ac	Merge pull request #788 from Unity-Technologies/Branch_FixHeightMapUpdate Branch fix height map update	7 年前
sebastienlagarde	01b7d081	HDRenderPipeline: Update all materils keyword in scene and project	7 年前
GitHub	84a0053a	Merge pull request #789 from Unity-Technologies/HDRP-GraphicTests Hdrp graphic tests	7 年前
GitHub	c36be30a	Revert "Hdrp graphic tests"	7 年前
GitHub	fa3e734e	Merge pull request #790 from Unity-Technologies/revert-789-HDRP-GraphicTests Revert "Hdrp graphic tests"	7 年前
GitHub	9909bf32	Revert "Revert "Hdrp graphic tests""	7 年前
GitHub	02a16451	Merge pull request #792 from Unity-Technologies/revert-790-revert-789-HDRP-GraphicTests Revert "Revert "Hdrp graphic tests""	7 年前
GitHub	d1a57b2a	Revert "Revert "Revert "Hdrp graphic tests"""	7 年前
GitHub	b4149381	Merge pull request #793 from Unity-Technologies/revert-792-revert-790-revert-789-HDRP-GraphicTests Revert "Revert "Revert "Hdrp graphic tests"""	7 年前
Raymond Graham	d1c64b56	Merge branch 'master' into gpuInstancingSupport	7 年前
Evgenii Golubev	77f9f167	Merge branch 'master'	7 年前
Peter Andreasen	3ccf74cc	merged from master	7 年前
Arnaud Carre	4bef6509	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop	7 年前
Remy	3b815534	Merge commit 'ccee1ef8a8d0611355aaeace2c3530b65e34dfe0' into FixFix_TestFrameworkTools # Conflicts: # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3004_CameraMotionVector_TranslateY.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3005_CameraMotionVector_TranslateZ.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3006_CameraMotionVector_RotateX.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3007_CameraMotionVector_RotateY.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3008_CameraMotionVector_RotateZ.unity.png # ImageTemplates/HDRenderPipeline/Scenes/3xxx_DebugView/3009_CameraMotionVector_FOV.unity.png # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3002_ObjectMotionVector/SinMove.cs # Te...	7 年前
Sebastien Lagarde	d111863a	update scene material	7 年前
Remy	2289f880	Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests # Conflicts: # Tests/Scripts/Editor/GraphicTests/HDRenderPipeline/DebugViewController_Editor.cs.meta	7 年前
Remy	45899e23	Remove multiply blend mode materials from tests	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 年前
Julien Ignace	4172199d	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into Branch_ScreenSpaceShadows # Conflicts: # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/CornelBox/Cornell Box.fbx.meta # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/CommonAssets/3DObjects/Sphere/Sphere.fbx.meta # Tests/GraphicsTests/RenderPipeline/HDRenderPipeline/Scenes/3xxx_DebugView/3003_CameraMotionVector_TranslateX.unity.meta	7 年前
Arnaud Carre	074f76bb	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderLoop into lwrp_batcher	7 年前
Sebastien Lagarde	5f384459	HDRenderPipeline: Update all materials	7 年前
Remy	afb74a48	Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests	7 年前
Sebastien Lagarde	5705de92	Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2	7 年前
Paul Melamed	c5fce3e3	Merge branch 'master' into prototype/decals_premult_alpha # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/HDRenderPipeline.cs	7 年前
GitHub	72c1efa3	Merge pull request #818 from Unity-Technologies/HDRP_GraphicTests Hdrp graphic tests	7 年前
sebastienlagarde	26147e28	Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2	7 年前
Frédéric Vauchelles	ca10cd2f	Merge	7 年前
Remy	f486e00a	Add SSS test scene	7 年前
Felipe Lira	c51ce48c	Merged master	7 年前
Remy	d85dd3e7	Correct head fbx scale	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 年前
GitHub	149c2fcb	Merge pull request #833 from Unity-Technologies/HDRP_GraphicTests Hdrp graphic tests	7 年前
Sebastien Lagarde	2b940af6	Update test SSS mat name	7 年前
Evgenii Golubev	75799cbf	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline into mainline	7 年前
Sebastien Lagarde	7760cd5e	Update SSS test scene	7 年前
GitHub	a0390c6e	Merge pull request #840 from Unity-Technologies/Update-SSS-and-transmission 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 年前
Remy	dbe97478	Add SSS max radius test	7 年前
Remy	5c57f0c2	Fixe file name : 1 - delete	7 年前
Remy	98d4ec69	Fix name : 2 - re-add	7 年前
Remy	5f60d1a8	Make SSS max distance test more readable Add pre-post scatter test	7 年前
Remy	eda4b46b	Stupid case issue fix 1	7 年前
Remy	0c94a893	Stupid case issue fix 2	7 年前
Remy	4c0e5f45	Case fix ... again ?	7 年前
GitHub	647cbfdb	Merge pull request #846 from Unity-Technologies/HDRP_GraphicTests Hdrp graphic tests	7 年前
sebastienlagarde	1d94ca60	Merge remote-tracking branch 'refs/remotes/origin/master' into prototype/decals_workflow	7 年前
John	cf25c602	Merge master	7 年前
Remy	b5ffd536	File names case getting me crazy 1/2	7 年前
Remy	bf0c641c	File names case getting me crazy 2/2	7 年前
Remy	5e8994c2	Replace emissive maps by spotlights	7 年前
Remy	7d2a78de	Rename file because of filename case issue, before going into berserk mode.	7 年前
Remy	d7fec4b5	Correct sky settigns in ShadowMask scene to have the shadow mask more obvious	7 年前
sebastienlagarde	174630e7	Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2	7 年前
GitHub	c26fa8d3	Merge pull request #857 from Unity-Technologies/HDRP_GraphicTests Hdrp graphic tests	7 年前
uygar	81cb95dc	Merge branch 'master' into shadows-biasing	7 年前
sebastienlagarde	c43a2771	Merge remote-tracking branch 'refs/remotes/origin/master' into Fix-flip-issue	7 年前
John	ba0245c3	Merge branch 'master' into LW-ScreenSpaceShadows	7 年前
Frédéric Vauchelles	d6743fba	Merge branch 'master' into feature/PlanarReflection	7 年前
John	3023e8c8	Merge Screen Space Shadows	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 年前
Evgenii Golubev	7e4a3052	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	7 年前
Paul Melamed	19876ed2	Merge branch 'master' into prototype/decals_gpu_optimization # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs	7 年前
sebastienlagarde	c3198024	Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-msaa	7 年前
Sebastien Lagarde	a28733e8	HDRenderPipeline: Update all materials	7 年前
Remy	2136ed15	Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests	7 年前
Tim Cooper	803d7f40	Merge remote-tracking branch 'origin/master' into LW-ScreenSpaceShadows-KeywordsReduction	7 年前
John	89a55fab	Merge branch 'LW-ScreenSpaceShadows-KeywordsReduction' into LW-ScreenSpaceShadows	7 年前
John	0bfdddfc	Merge Screen Shadows	7 年前
Julien Ignace	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 年前
sebastienlagarde	83b753ad	Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2	7 年前
Frédéric Vauchelles	672c909b	Merge branch 'master' into feature/ScreenSpaceProjection # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Debug/DebugDisplay.cs # ScriptableRenderPipeline/HDRenderPipeline/HDRP/SceneViewDrawMode.cs.meta # Tests/Scripts/Editor/GraphicTests/Framework/TestResultWindow.cs.meta	7 年前
Sebastien Lagarde	eca15a2d	Merge remote-tracking branch 'refs/remotes/origin/master' into Update-material-features-performance-	7 年前
sebastienlagarde	046a77ef	Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing	7 年前
Remy	da4312b1	Modify test framework to be able to use multiple render pipeline assets for a single test, in order to test parity of features. Modified LWRP testscenes accordingly.	7 年前
GitHub	f5287a0f	Merge pull request #906 from Unity-Technologies/HDRP_GraphicTests Hdrp graphic tests	7 年前
Frédéric Vauchelles	78ba9e5b	Merge master	7 年前
sebastienlagarde	b1b2e631	Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing	7 年前
John	3174776d	Merge branch 'master' into LW-ScreenSpaceShadows	7 年前
John	0a72692b	Merge branch 'LW-ScreenSpaceShadows' into projects/TheLastStand	7 年前
sebastienlagarde	301dbf72	Merge remote-tracking branch 'refs/remotes/origin/master' into Improve-normal-shading	7 年前
Sebastien Lagarde	76cc874d	Re-introduce none case for double sided	7 年前
Sebastien Lagarde	07e997b0	Update test scene	7 年前
GitHub	3b36aa0b	Merge pull request #936 from Unity-Technologies/support-none-case-for-doublesided Support none case for doublesided	7 年前
sebastienlagarde	5e5e46c8	Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence	7 年前
Remy	619cd52e	Merge branch 'HDRP_GraphicTests' into MaterialUpgrader_Upgrade	7 年前
sebastienlagarde	35560656	Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing	7 年前
Paul Melamed	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	7 年前
Evgenii Golubev	070349c8	Merge branch 'master'	7 年前
sebastienlagarde	a450e83a	Merge remote-tracking branch 'refs/remotes/origin/master' into Add-physical-Light-unit-2	7 年前
Tim Cooper	aeefe219	Merge branch 'master2' into LW-LightOptimizations	7 年前
Robert Srinivasiah	7427bb14	Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting	7 年前
sebastienlagarde	5f14b489	Update all materials with Last PR	7 年前
GitHub	ce027b15	Merge pull request #947 from Unity-Technologies/Improve-forward-opaque-pass Update all material for PR 946	7 年前
sebastienlagarde	44c4a197	Merge remote-tracking branch 'refs/remotes/origin/master' into support-iridescence	7 年前
Evgenii Golubev	e768893e	Merge branch 'master'	7 年前
Remy	d56ea57d	Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests	7 年前
Remy	0ac4d650	Make the tests more sensitive (tile average comparison instead of full image average). Update templates. Compare with Lab colorspace	7 年前
Robert Srinivasiah	a3ddcd05	Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting	7 年前
GitHub	4bbe5773	Merge pull request #951 from Unity-Technologies/HDRP_GraphicTests Big graphic test framework update.	7 年前
Robert Srinivasiah	2e77d205	Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting	7 年前
sebastienlagarde	2c61701c	Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing	7 年前
Sebastien Lagarde	67b01344	Update texture param of object space normal map	7 年前
GitHub	4a48a252	Merge pull request #958 from Unity-Technologies/Fix-Graphic-test-1201 Update texture param of object space normal map	7 年前
Robert Srinivasiah	2d5b988d	Merge remote-tracking branch 'origin/master' into hdrp-xr-lighting	7 年前
Peter Andreasen	04b933d9	merged with master	7 年前
sebastienlagarde	e347d974	Merge remote-tracking branch 'refs/remotes/origin/master' into shadows-biasing	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 年前
Remy	bbc4a0ea	Remove reference to normal map OS in normal map slot of a material (avoid normal map conversion popup)	7 年前
GitHub	bf886cd0	Merge pull request #998 from Unity-Technologies/HDRP_GraphicTests Update, Fixes, and less space used !	7 年前
Evgenii Golubev	504b9374	Merge remote-tracking branch 'upstream/HDRP_GraphicTests' into 2018.1	7 年前
Robert Srinivasiah	667518b2	Merge remote-tracking branch 'origin/master' into lwrp-xr-shader-fixes	7 年前
Evgenii Golubev	0a2033df	Merge upstream/master	7 年前
Paul Melamed	6f570901	Merge branch 'master' into decals/api_change # Conflicts: # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Decal/DecalSystem.cs	7 年前
John Parsaie	8cc0d941	Merge SRP 2018.1	7 年前
GitHub	47d42b36	Merge pull request #1 from Unity-Technologies/master Merge from main	7 年前
Frédéric Vauchelles	fd3d298d	Merge branch 'master' into feature/ReflectionProbeBaking	7 年前
Julien Ignace	97f5e51c	Update materials in HDRP tests	7 年前
GitHub	4a6f75f8	Merge pull request #1068 from Unity-Technologies/Branch_UpdateMaterials Update materials in HDRP tests	7 年前
Julien Ignace	88c2ad28	Pushed missing updated materials.	7 年前
GitHub	566e00cc	Merge pull request #1073 from Unity-Technologies/Branch_UpdateMaterials Pushed missing updated materials.	7 年前
Felipe Lira	47a2960a	Merge branch 'master' into LW-Bugfix # Conflicts: # ScriptableRenderPipeline/LightweightPipeline/LWRP/ShaderLibrary/Shadows.hlsl	7 年前
sebastienlagarde	aa772a18	Merge remote-tracking branch 'refs/remotes/origin/master' into hdrp-xr-clustered	7 年前
Evgenii Golubev	720c8a19	Merge branch 'master'	7 年前
Julien Ignace	79ecc6d5	Fixed some data and updated reference screenshots for HDRP graphics tests	7 年前
Evgenii Golubev	dd8b51a8	Merge branch 'master'	7 年前
GitHub	39fa31ad	Merge pull request #1085 from Unity-Technologies/Branch_FixGraphicsTests Fixed some data and updated reference screenshots for HDRP graphics tests	7 年前
Felipe Lira	b33ad0e5	Merged master.	7 年前
Felipe Lira	049fa5ed	Merge branch 'master' into lw/shadow-optimization # Conflicts: # ScriptableRenderPipeline/LightweightPipeline/LWRP/LightweightPipeline.cs	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 年前
Remy	da27105b	Merge remote-tracking branch 'origin/master' into HDRP_GraphicTests	7 年前
Evgenii Golubev	1d711357	Merge 'upstream/master'	7 年前
Matt Dean	f98f82d0	Merge remote-tracking branch 'origin/LWRP' into LW-DistortionPass	7 年前
Frédéric Vauchelles	62c37c0f	Update refraction test scene	7 年前
GitHub	a2790a45	Merge pull request #1159 from Unity-Technologies/feature/RefractionModes Screen Space Refraction Projection Model	7 年前
Evgenii Golubev	8d663ac4	Merge upstream/master	7 年前
Paul Melamed	5e4ad2d7	Merge branch 'master' into decals/texture_atlas # Conflicts: # ScriptableRenderPipeline/Core/CoreRP/CoreResources/TexturePadding.compute # ScriptableRenderPipeline/HDRenderPipeline/HDRP/Lighting/Light/HDAdditionalLightData.cs	7 年前
Evgenii Golubev	999f9fa8	Merge branch 'master' of https://github.com/Unity-Technologies/ScriptableRenderPipeline	7 年前
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...	7 年前
sebastienlagarde	5f5c5dd3	Update SSS graphic test	7 年前
GitHub	15da236b	Merge pull request #1221 from Unity-Technologies/Update-SSS-graphic-test Update SSS graphic test	7 年前
Stephane Laroche	61ee5830	Merge branch 'master' into stacklit	7 年前
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	7 年前