Skip to content

Universal Staging #6085

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 8 commits into from
Oct 22, 2021
Merged

Universal Staging #6085

merged 8 commits into from
Oct 22, 2021

Conversation

phi-lira
Copy link
Contributor

@phi-lira phi-lira commented Oct 20, 2021 •
edited
Loading

Merge universal staging:

@phi-lira
Update light2d properties and expose settor for sprite light
98e16dd 
#5926

commit 2a7950f
Author: Kenny Tan <kenny.tan@unity3d.com>
Date:   Tue Oct 12 16:51:52 2021 +0800

    Remove check for m_DeprecatedPointLightCookieSprite

commit 25cf985
Author: Kenny Tan <kenny.tan@unity3d.com>
Date:   Wed Oct 6 11:55:05 2021 +0800

    Update light2d properties and expose settor for sprite light
@phi-lira
Fix invalid viewport being set during post process pass when using Pi…
604460e 
…xel Perfect Camera #6014

commit 8630c77
Author: Kenny Tan <kenny.tan@unity3d.com>
Date:   Thu Oct 14 14:28:46 2021 +0800

    Fix invalid viewport being set during post process pass when using pixel perfect camera
@phi-lira
Adding test scenes for the Volume Update Feature #4708
d071134 
commit 8fad502
Merge: 669789b 5b53dd5
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Tue Oct 19 13:35:00 2021 +0200

    Merge branch 'master' into universal/enable-160-test

    # Conflicts:
    #	TestProjects/UniversalGraphicsTest_PostPro/ProjectSettings/EditorBuildSettings.asset

commit 669789b
Merge: 5ef3bcc be573f7
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri Aug 27 08:10:46 2021 +0200

    Merge branch 'master' into universal/enable-160-test

commit 5ef3bcc
Merge: b72a4ed 73ef535
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Wed Aug 25 14:49:56 2021 +0200

    Merge branch 'master' into universal/enable-160-test

commit b72a4ed
Merge: a211ff4 00abfa2
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Mon Jun 14 14:41:58 2021 +0200

    Merge branch 'master' into universal/enable-160-test

commit a211ff4
Merge: de69352 170b7ed
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Tue Jun 8 12:55:01 2021 +0200

    Merge branch 'master' into universal/enable-160-test

commit de69352
Merge: 0b9bc99 4e13f51
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri Jun 4 11:32:35 2021 +0200

    Merge branch 'master' into universal/enable-160-test

commit 0b9bc99
Merge: 7809cba 4dc46c9
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Mon May 31 14:36:51 2021 +0200

    Merge branch 'master' into universal/enable-160-test

commit 7809cba
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Mon May 31 14:32:15 2021 +0200

    Removing a Debug.Log line.

commit e3eda78
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri May 28 16:08:47 2021 +0200

    Forgot to add the changes to the build settings

commit 5bd01ea
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri May 28 15:15:26 2021 +0200

    Test scenes for the Volume Update Feature
@phi-lira
Public API for URP DebugDisplaySettings #5682
4b754ab 
commit c0c961d
Merge: f6e204f b8c4896
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Wed Oct 13 10:54:12 2021 +0300

    Merge branch 'master' into srp/urp-debugdisplay-api

    # Conflicts:
    #	com.unity.render-pipelines.universal/CHANGELOG.md

commit f6e204f
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Tue Oct 5 12:06:17 2021 +0300

    Change public fields into public properties.

    - Exposed public setters to albedoHueTolerance and albedoSaturationTolerance that were still private.
    - Fixed compile error in player build due to renamed symbol.

commit 793e63f
Merge: 945724e f0c1049
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Mon Oct 4 16:09:35 2021 +0300

    Merge branch 'master' into srp/urp-debugdisplay-api

    # Conflicts:
    #	com.unity.render-pipelines.universal/CHANGELOG.md
    #	com.unity.render-pipelines.universal/Runtime/Debug/DebugDisplaySettingsCommon.cs
    #	com.unity.render-pipelines.universal/Runtime/Debug/DebugDisplaySettingsRendering.cs
    #	com.unity.render-pipelines.universal/Runtime/Debug/UniversalRenderPipelineDebugDisplaySettings.cs
    #	com.unity.render-pipelines.universal/Runtime/ScriptableRenderer.cs

commit 945724e
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Thu Sep 16 14:26:26 2021 +0300

    Iterate m_Settings array instead of calling each settings object individually.

    - Changed DebugDisplaySettingsCommon interface implementation because of this. The common settings now report everything as "not active" because the widgets are not owned by it.

commit 17a8ef5
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Thu Sep 16 10:46:41 2021 +0300

    Fix casing to camelCase for settings properties

commit df48fa1
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Thu Sep 16 10:06:08 2021 +0300

    Changelog

commit 2971ab6
Author: Arttu Peltonen <arttu.peltonen@unity3d.com>
Date:   Thu Sep 16 09:15:36 2021 +0300

    Public API for URP DebugDisplaySettings

    - Made the settings API public
    - Renamed properties to be more uniform with each other and use camelCase
    - Added new Material Albedo validation preset: AlbedoDebugValidationPreset.Custom
@phi-lira
Update reflection probe tooltips. #6037
46b45e3 
commit 4e33d42
Author: Erik Hakala <erik.hakala@unity3d.com>
Date:   Fri Oct 15 18:27:32 2021 +0300

    Adjust bias tooltips according to the audit.

commit 7c54164
Author: Erik Hakala <erik.hakala@unity3d.com>
Date:   Wed Oct 13 13:42:58 2021 +0300

    Fix camera enum display name.
@phi-lira
Universal: Fixing 146 MSAA test scene. #6065
6462029 
commit 6d8b669
Merge: 72deede 5b53dd5
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Tue Oct 19 13:56:40 2021 +0200

    Merge branch 'master' into universal/fix-msaa-test

    # Conflicts:
    #	TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/146_MSAA_RenderToBackbuffer.png

commit 72deede
Merge: 289157a 883bd1c
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Tue Sep 21 09:56:18 2021 +0200

    Merge branch 'master' into universal/fix-msaa-test

commit 289157a
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 11:07:07 2021 +0200

    Updating Reference Images for DX11 and DX12

commit a3ac932
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 10:34:32 2021 +0200

    Lowering the threshold to 0.001

commit 861336e
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 10:33:34 2021 +0200

    Increasing the test threshold from 0 to 0.0025

commit 5d16930
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 10:09:36 2021 +0200

    Reverting a change in QualitySettings

commit 1ccfb01
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 09:43:02 2021 +0200

    Materials

commit ba0de50
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 09:42:08 2021 +0200

    Reverting a change in GraphicsSettings and QualitySettings

commit 9dced83
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 08:26:18 2021 +0200

    Minor cleanup of RP Assets.

commit f0c5d56
Merge: 83fa04a f0467f4
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Thu Sep 16 08:11:44 2021 +0200

    Merge branch 'master' into universal/fix-msaa-test

    # Conflicts:
    #	TestProjects/UniversalGraphicsTest_PostPro/Assets/ReferenceImages/Linear/LinuxPlayer/Vulkan/None/146_MSAA_RenderToBackbuffer.png

commit 83fa04a
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri Feb 19 13:24:15 2021 +0100

    Fixing MSAA test scene

commit f2c3b10
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri Feb 19 13:08:27 2021 +0100

    Revert "Fixing 146 MSAA test."

    This reverts commit a0c849e.

commit a0c849e
Author: Elvar Örn Unnþórsson <ellioman@ellioman.com>
Date:   Fri Feb 19 13:04:51 2021 +0100

    Fixing 146 MSAA test.
@phi-lira
Universal/depth copy as color #5987
9badf08 
commit 70ad6ee
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Thu Oct 14 15:04:53 2021 +0300

    adding some editor-specific code to avoid a bug with editor setting incorrect depth buffer while on game view

commit 850428a
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Wed Oct 13 12:28:57 2021 +0300

    null exception fix

commit 427e0cb
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Wed Oct 13 10:02:30 2021 +0300

    another DeferredLights null check

commit fcb7d7f
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Tue Oct 12 15:31:42 2021 +0300

    fix for RTIs non render pass platforms

commit 62ca66d
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Oct 12 13:14:55 2021 +0300

    fixing shader compilation error and renaming define for fb fetch idx

commit b5a042f
Merge: 4deded8 f9152cf
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Oct 12 12:11:44 2021 +0300

    Merge branch 'universal/depth-copy-as-color' of ssh://github.com/Unity-Technologies/Graphics into universal/depth-copy-as-color

commit f9152cf
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Tue Oct 12 12:07:03 2021 +0300

    adding fb fetch to Gbuffer decals and some other depth related fixes for decals

commit 159580e
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Mon Oct 11 17:37:35 2021 +0300

    fixing DBuffer Decals CopyDepth pass not copying the depth and failing rendering

commit f95fafb
Merge: c4ddd12 e718a8e
Author: Jonas Sideravičius <jonass@unity3d.com>
Date:   Mon Oct 11 13:45:13 2021 +0300

    Merge branch 'master' into universal/depth-copy-as-color

commit 4deded8
Merge: c4ddd12 1ede825
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Wed Oct 6 16:30:14 2021 +0300

    Merge branch 'master' into universal/depth-copy-as-color

commit c4ddd12
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Wed Aug 25 13:40:27 2021 +0300

    changing the semantic for outDepthColor in VFXPasses.template

commit 5dec840
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Aug 24 11:53:11 2021 +0300

    adding depth output for VFXGraph depth only passes

commit 2510a18
Merge: fd4df44 a938468
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Mon Aug 23 12:00:52 2021 +0300

    Merge branch 'master' into universal/depth-copy-as-color

commit fd4df44
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Aug 19 15:47:23 2021 +0300

    adding _OUTPUT_DEPTH keyword to CopyDepthPass to select correct output buffer in shader

commit 165f4d5
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Aug 17 17:26:19 2021 +0300

    some cleanup and refactoring and enabling Renderpass for SS forward decals

commit 4f9cbd7
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Aug 17 16:02:04 2021 +0300

    adding depth copy for renderpass as well and changing how fake depth is handled

commit 68d3938
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Aug 17 10:33:59 2021 +0300

    terrain shader passes depthonly pass fix to output clippos

commit 399ee75
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Mon Aug 16 16:30:48 2021 +0300

    formatting fixes

commit ee6e7d4
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Mon Aug 16 11:48:25 2021 +0300

    enabling depthbuffer for depth copy and adding additional override for ConfigureTarget

commit 6accb1c
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Fri Aug 13 16:42:23 2021 +0300

    merge fix - change descriptor for DepthOnly configureTarget to the correct one

commit d887392
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Fri Aug 13 16:10:30 2021 +0300

    fix after updating trunk

commit 624f0a1
Merge: 933f089 8ee37d5
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Aug 12 16:53:11 2021 +0300

    Merge branch 'master' into universal/depth-copy-as-color

commit 933f089
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Aug 12 16:43:25 2021 +0300

    making depthOnly pass compatible to render color texture and changing shaders to accommodate that

commit c149ec9
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Aug 5 14:40:21 2021 +0300

    adding IsTransientAttachment to ScriptableRenderPass/NativeRenderPass code

commit d39e96d
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Tue Aug 3 11:59:28 2021 +0300

    disable fbfetch on DbufferDeferred decals

commit d1cef12
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Jul 29 11:57:25 2021 +0300

    Revert "some changes to the Foundation Project for Repro project (to be reverted later on)"

    This reverts commit 80af9be.

commit 80af9be
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Jul 29 11:21:14 2021 +0300

    some changes to the Foundation Project for Repro project (to be reverted later on)

commit a2e4eb6
Author: Jonas Sideravicius <jonass@unity3d.com>
Date:   Thu Jul 29 11:02:07 2021 +0300

    switching _CameraDepthTexture to R32Float and accommodating some stuff for that
@phi-lira
Factorize template & SubTarget<UniversalTarget> #5467
d72e0b2 
commit 03cd89b
Merge: d3ec70a 9fd657c
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Thu Sep 23 09:36:27 2021 +0200

    Merge branch 'master' into urp/vfx/factorize-template-to-ease-sg-support

    # Conflicts:
    #	com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteCustomLitSubTarget.cs
    #	com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteLitSubTarget.cs
    #	com.unity.render-pipelines.universal/Editor/2D/ShaderGraph/Targets/UniversalSpriteUnlitSubTarget.cs

commit d3ec70a
Merge: 7502dba 2116818
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Aug 30 13:51:30 2021 +0200

    Merge branch 'master' into urp/vfx/factorize-template-to-ease-sg-support

commit 7502dba
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Aug 30 12:31:35 2021 +0200

    Use common UniversalSubTarget for Sprite & Decal

commit 8d271f3
Author: Paul Demeulenaere <pauld@unity3d.com>
Date:   Mon Aug 30 10:41:17 2021 +0200

    Use uber template for all urp target
@phi-lira phi-lira requested review from a team as code owners October 20, 2021 14:55
@github-actions
Copy link

Hi! This comment will help you figure out which jobs to run before merging your PR. The suggestions are dynamic based on what files you have changed.
Link to Yamato: https://unity-ci.cds.internal.unity3d.com/project/902/
Search for your PR branch using the search bar at the top, then add the following segment(s) to the end of the URL (you may need multiple tabs depending on how many packages you change)

URP
/jobDefinition/.yamato%252Fall-urp.yml%2523PR_URP_trunk
With changes to URP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

VFX
/jobDefinition/.yamato%252Fall-vfx.yml%2523PR_VFX_trunk

SRP Core
You could run ABV on your branch before merging your PR, but it will start A LOT of jobs. Please be responsible about it and run it only when you feel the PR is ready:
/jobDefinition/.yamato%252F_abv.yml%2523all_project_ci_trunk
Be aware that any modifications to the Core package impacts everyone in the Graphics repo so please discuss the PR with your lead.

Depending on the scope of your PR, you may need to run more jobs than what has been suggested. Please speak to your lead or a Graphics SDET (#devs-graphics-automation) if you are unsure.

@github-actions
Copy link

It appears that you made a non-draft PR!
Please convert your PR to draft (button on the right side of the page).
See the PR template for more information.
Thank you!

ernestasKupciunas
ernestasKupciunas approved these changes Oct 21, 2021
View reviewed changes
Copy link

@ernestasKupciunas ernestasKupciunas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approving without testing. All PRs are either tested locally by the developers or QA. For the bugfixes, RCA was done or not needed.

@phi-lira phi-lira merged commit 31106af into master Oct 22, 2021
This was referenced Oct 22, 2021
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ernestasKupciunas ernestasKupciunas ernestasKupciunas approved these changes

Assignees
No one assigned
Labels
SRP testing universal vfx
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@phi-lira @ernestasKupciunas