Skip to content
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

Add adaptive performance decals scaler options. #6013

Merged
merged 13 commits into from
Oct 26, 2021
Merged

Add adaptive performance decals scaler options. #6013

merged 13 commits into from
Oct 26, 2021

Conversation

odbb
Copy link
Contributor

@odbb odbb commented Oct 13, 2021

Please read the Contributing guide before making a PR.

Checklist for PR maker

  • Have you added a backport label (if needed)? For example, the need-backport-* label. After you backport the PR, the label changes to backported-*.
  • Have you updated the changelog? Each package has a CHANGELOG.md file.
  • Have you updated or added the documentation for your PR? When you add a new feature, change a property name, or change the behavior of a feature, it's best practice to include related documentation changes in the same PR. If you do add documentation, make sure to add the relevant Graphics Docs team member as a reviewer of the PR. If you are not sure which person to add, see the Docs team contacts sheet.
  • Have you added a graphic test for your PR (if needed)? When you add a new feature, or discover a bug that tests don't cover, please add a graphic test.

Purpose of this PR

This adds Adaptive Performance decal scaler support.

Testing status

Manual Adaptive Performance tests - can be viewed in https://github.cds.internal.unity3d.com/unity/com.unity.adaptiveperformance/pull/118#

Comments to reviewers

Requires https://github.cds.internal.unity3d.com/unity/com.unity.adaptiveperformance/pull/118# - only works when Adaptive Performance is installed.

@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%252Fall-lightmapper.yml%2523PR_LightMapper_trunk

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.

@odbb odbb requested review from phi-lira and a team and removed request for phi-lira October 13, 2021 21:39
@odbb odbb self-assigned this Oct 14, 2021
@odbb odbb marked this pull request as ready for review October 14, 2021 15:46
@odbb odbb requested a review from a team as a code owner October 14, 2021 15:46
@odbb
Move logic to DecalRenderFeature to remove dependency of Rendering As…
238dcc7 
…set.
@odbb
Fixed old define.
23ad48c
@odbb
Added some safeguards for edtitor.
ed9e890
@odbb
fix fomrating
95909da
@odbb
Merge branch 'master' into adaptive-performance/add-decals-scaler
1964f32 
* master: (148 commits)
  [HDRP] Add custom pass buffer scaling functions (#5809)
  Fix HDRP template input not working when using the new Input System and no Keyboard/Mouse (#6045)
  [SRP] Bump package version to 13.2.0 (#6049)
  ** Improving FTPL perf on ps4 by .3 ms on average ** (#5866)
  Remove min version from package.json (#6044)
  Fix subdiv view (#6033)
  Small qol (#6036)
  APV: update some tooltips and add a clamp on dilation validity threshold (#6005)
  SRP bump to 13.1.1 (#6041)
  (SRP] Bump min version to a12 to fix Yamato
  Vfx/fix/1289612 filter texture by dimension (#5715)
  [HDRP] Fix 9601/9602 reference screenshots after cache server weirdness
  [CI] [trunk] Updated editor to 5a5aca0fb632e01b9b362f6deb73bcf599d612ca
  [CI] [trunk] Updated editor to 7b5b9bb6eed88e40de00efa2a629dd8f0b2bfee2
  [CI] [trunk] Updated editor to a397ac6302d3ce68bd3eeea7721610a649addfa3
  [CI] [trunk] Updated editor to dd9d77b7ded66b5edad4dacf123ffbb6c8d8c4bf
  [CI] [trunk] Updated editor to 6c7822fe613adfea64bb232c817a2fdee34fc273
  [CI] [trunk] Updated editor to aae7fd02ff5afebc831948d25c52dcf704a8a3f3
  [CI] [trunk] Updated editor to 9c278756e419ae931cabac6c5dd60f24e05c6de3
  [CI] [trunk] Updated editor to d3dc7fc8d330da1155ec00683876a559b2a63281
  ...
lukaschod
lukaschod approved these changes Oct 19, 2021
View reviewed changes
Copy link
Contributor

@lukaschod lukaschod left a comment

Choose a reason for hiding this comment

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

Looks good, just minor thing about property

@odbb
Merge branch 'master' into adaptive-performance/add-decals-scaler
6e903e4 
* master:
  Enable iris normal for Eye shader (#5880)
  Update to HDRP Asset analytics (#6060)
  [HDPR] Update reference screenshots for Linux Vulkan
  Update 206_Motion_Vectors.png (#6046)
  Updated code owner for URP (#6052)
  [URP] Re-enable ios pbr tests #5983
  Fix error when using gizmos with camera stack in editor #5913
  emitting UI geometry for offscreen cameras too (case 1344969 fix) #5894
  Remove deprecated UNITY_USE_NATIVE_HDR keyword from shader code. #5569
  [XR][URP] Fix issue with vignette location in XR #5471 #5471
@odbb
Upgrade to properties.
69f0fc4
@odbb odbb mentioned this pull request Oct 19, 2021
Merged
4 tasks
@odbb odbb requested a review from a team October 20, 2021 14:15
@odbb
Merge branch 'master' into adaptive-performance/add-decals-scaler
095a1de 
* master:
  Add missing shader stages in shader keyword copying  (#6008)
  [Yamato] Add all DX11 job for URP (#6075)
  [HDRP] Add more performance test coverage (#5814)
  Fix templates ISO date (#6073)
  Fix division by 0 when AO is 0 (#6078)
  Fixed grammar errors (#6077)
  [HDRP][Path Tracing] Improved robustness of the stacklit material (#6066)
  [APV] Cell streaming system (#5731)
  Update revision for URP update test project (#6061)
  [HDRP][Path Tracing] Camera ray misses now return a null value with Minimum Depth > 1 (#6067)
  Renable missing test (Lens Flare) (#5456)
  [HDRP][Path Tracing] Added proper support for interleaved tiling (#5953)
  Fix to render depth or depth/normal of waving grass (#4097)
  Remove ScreenSpaceShadowResolvePass (#6002)
  [HDRP][Docs] Update docs with RendererList related option (#6031)
  Layer drawer used in ray/path tracing now matches 100% with camera's. (#5956)
  Fix iridescence tooltip (#5950)
  [HDRP] Change RenderGraph Begin/Execute function pattern to avoid leaks (#5929)
  [HDRP] Fix errors when switching build targets in editor (#5918)
  Generate a material as a subasset for ShaderGraphs (#5795)
@odbb
Add missing #if
b68a34b
@odbb
Merge branch 'master' into adaptive-performance/add-decals-scaler
d262fa5 
* master: (34 commits)
  [CI] [trunk] Updated editor to 71d43f7a9c283602dfa9ca30d1612a5f96669ce6
  [CI] [trunk] Updated editor to 756326289f616b56dfc4d33e1e100f8c55f4f4dd
  [CI] [trunk] Updated editor to 79f62b478eab3bff7d976389ac595d22b3d92ea8
  [CI] [trunk] Updated editor to 2ba64ae756e1a5e1f8d28366b3997b93e1ad8c06
  [CI] [trunk] Updated editor to 4ee92eab5b1c45445d7bde18f79092e038b25c18
  [CI] [trunk] Updated editor to f69b782c69a261254bcf675990bf0b95d760241f
  [CI] [trunk] Updated editor to 8fb7045e2fb7cc51f34d1d2ea3b9b915505446a8
  [CI] [trunk] Updated editor to 91b6a06e4db16a5544fa8295fa1f34a11370c854
  [CI] [trunk] Updated editor to a546380a92f7786964410a2a613c21c404543ba1
  [CI] [trunk] Updated editor to 7cb303c3e237610063c0730f664227bc39a1b6dd
  [CI] [trunk] Updated editor to 48abda43486a7a1ed18843a4230d199eb2c528fb
  [CI] [trunk] Updated editor to c84602062b98f888f524cec4751428744917d4ad
  [CI] [trunk] Updated editor to e74e2cbd678431a99cf164787292a5c6055a6f6b
  [CI] [trunk] Updated editor to 0fab5d51aece29e56ac649167d90526ae42d7553
  [CI] [trunk] Updated editor to c690852662be40af08de46254b562e3f81c316d7
  [CI] [trunk] Updated editor to 6504912e3fc0f4e4c5e3211d865ba6b4a3a3aef7
  [CI] [trunk] Updated editor to 19f3770f5984f819691f79fdd46d258b284a2dc0
  [CI] [trunk] Updated editor to 8e8d1a800a12550f12ad7898fc6c1ee19c32cf2b
  [CI] [trunk] Updated editor to 3e4dad0ae865c0af5648283abf09ad1342f3e22d
  [CI] [trunk] Updated editor to 18a82af6f989b7767cbf8ade4dd88b66717b0cf8
  ...
@odbb odbb removed the request for review from a team October 21, 2021 16:09
@odbb
Merge branch 'master' into adaptive-performance/add-decals-scaler
36bbf62 
* master:
  [HDRP][URP][SpeedTree8] Set shadergraph as default SpeedTree 8 shader for Universal. Clean up HDRP importers/upgraders. (#5851)
  Remove emissive contribution when current depth < min depth. (#6099)
  [HDRP] Fix new pathtracer stacklit test failing for XR + Update 3DS max test with new reference image (#6098)
@phi-lira
Copy link
Contributor

Kicked URP DX11 playmode. Once green I will merge this to staging branch.

@phi-lira phi-lira changed the base branch from master to universal/staging October 26, 2021 15:05
@phi-lira
Copy link
Contributor

DX11 Playmode tests green https://unity-ci.cds.internal.unity3d.com/job/9522969

@phi-lira phi-lira merged commit 87dca0b into universal/staging Oct 26, 2021
@phi-lira phi-lira deleted the adaptive-performance/add-decals-scaler branch October 26, 2021 15:26
phi-lira pushed a commit that referenced this pull request Nov 9, 2021
@odbb @phi-lira
Add adaptive performance decals scaler options. (#6013)
dedf16c 
* Add adaptive performance decals scaler options.

* Move logic to DecalRenderFeature to remove dependency of Rendering Asset.

* Fixed old define.

* Added some safeguards for edtitor.

* fix fomrating

* Upgrade to properties.

* Add missing #if
@phi-lira phi-lira mentioned this pull request Nov 9, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@phi-lira phi-lira phi-lira approved these changes

@lukaschod lukaschod lukaschod approved these changes

Assignees

@odbb odbb

Labels
universal
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@odbb @phi-lira @lukaschod