Skip to content

Conversation

cinight
Copy link
Contributor

@cinight cinight commented Nov 15, 2021

Purpose of this PR

Rename BatchRendererGroup projects to reduce confusion as they do not rely on DOTS.
Automate the BatchRendererGroup projects so that they can run nightly or put in Graphics ABV.

What has changed

  • Renamed UniversalHybridTest and HDRP_HybridTests to BatchRendererGroup_URP and BatchRendererGroup_HDRP
  • Updated reference images so that the tests can pass correctly
  • @sophiaaar helped updating and CI files accordingly

Testing status

Me and @TomasKiniulis ran tests on Yamato with existing CIs to prove the tests are working.
Win & Linux are green. Mac Metal failed due to some instabilities.
Therefore we can add Win & Linux to nightly / ABV first.

BatchRendererGroup_URP
Universal_BatchRendererGroup_trunk - green✅

  • Win Dx11 playmode and standalone
  • Win Vulkan playmode and standalone
  • Linux Vulkan playmode and standalone

BatchRendererGroup_HDRP
HDRP_BatchRendererGroup_trunk - green ✅

  • Win Dx11 playmode and standalone
  • Win Dx12 playmode and standalone
  • Win Vulkan playmode and standalone
  • Linux Vulkan playmode and standalone

Comment to reviewers

There are only test projects and related yml file changes.

@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)

HDRP
/jobDefinition/.yamato%2Fall-hdrp.yml%23PR_HDRP_trunk
With changes to HDRP packages, you should also run
/jobDefinition/.yamato%2Fall-lightmapping.yml%23PR_Lightmapping_trunk

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

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.

Sophia and others added 13 commits November 15, 2021 15:10
# Conflicts:
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Lit.mat
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Lit.mat.meta
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/LitTessellation.mat
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/LitTessellation.mat.meta
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat
#	TestProjects/BatchRendererGroup_HDRP/Assets/SampleScenes/BRGGameObjects/Unlit.mat.meta
#	TestProjects/BatchRendererGroup_HDRP/ProjectSettings/SceneTemplateSettings.json
#	TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat
#	TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/TestMaterial1.mat.meta
#	TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat
#	TestProjects/HDRP_HybridTests/Assets/SampleScenes/BRGGameObjects/TestMaterial2.mat.meta
@cinight cinight marked this pull request as ready for review November 17, 2021 09:26
@cinight cinight requested a review from a team as a code owner November 17, 2021 09:26
@github-actions github-actions bot added the sdet label Nov 17, 2021
Copy link
Contributor

@kivistikliis kivistikliis left a comment

Choose a reason for hiding this comment

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

The .yml side looks good to me!

Copy link
Contributor

@theopnv theopnv left a comment

Choose a reason for hiding this comment

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

We can remove line 25 and 32 of the .repoconfig file, as these test folders were renamed https://github.com/Unity-Technologies/Graphics/blob/hybrid/BRGTestProject_Automate/.repoconfig#L25. No need to add the BatchRenderer projects to this file, that way they won't be excluded from the formatting checks (and will comply to unity rules :))
Thanks for the PR!

@cinight cinight merged commit b41f0a1 into master Nov 18, 2021
@cinight cinight deleted the hybrid/BRGTestProject_Automate branch November 18, 2021 10:38
Verasl pushed a commit that referenced this pull request Nov 18, 2021
* update reference images

* Update HDRP failing test reference images

* Add HDRP Linux Vulkan test images

* Rename UniversalHybridTest to BatchRendererGroup_URP

* Move vulkan win ref images to None folder

* Rename HDRP_HybridTests to BatchRenderGroup_HDRP

* replace hybrid with BRG and add to nightly

* Fix HDRP project name type

* fix typo

* Add .meta files of added reference images

* remove playmode_xr

* Update RenderBRG.cs scripts from hrnext-bugfix

* Update BrgGameojbects hdrp reference images after master merge

* Add vulkan to HDRP brg windows

* use gpu for build, remove osx from ci

* apply patch from the [Yamato] Formatting job

* add BRG to nightly [skip ci]

* remove the hybrid projects from repoconfig

Co-authored-by: MingWai Chan <mingwai@unity3d.com>
Co-authored-by: Tomas Kiniulis <tomas.kiniulis@unity3d.com>
Co-authored-by: Sophia <sophia@unity3d.com>
ellioman added a commit that referenced this pull request Jan 28, 2022
* URP quality improvements (#6090)

* "Add Renderer Feature" menu now uses the same menu as "Volume Overrides"

* Universal Renderer help URL

* Add page hash to help URL helper

* Allow renderer features to use HelpURLAttribute and add it for SSAO, Decal, and Render Objects

* Remove Name input for SSAO and Screen Space Shadows

* Fix help URL for URP asset

* Update change log

* Fix change log

* Remove `Attribute` suffix from attribute usage

* Add docs for FilterWindow.Show

* Move GetHelpURL to DocumentationUtils

* Improve TryGetHelpURL interface

* Upgrade test materials and assets for premultiplied blend parity. (#6326)

* Upgraded Runtime/Materials/*.mat files.

* Foundation CommonAssets/ *.mat files upgrade.

* Foundation Scenes/ .mat files upgrade.

* Foundation Scenes/ .renderTexture files upgrade.

* Lighting CommonAssets/ .mat upgrade.

* Lighting EditMode Assets .mat files upgrade.

* Lighting Scenes/ .mat files upgrade.

* Lighting Scenes/ .renderTexture files upgrade.

* Terrain CommonAssets/ .mat files upgrade.

* Terrain Scenes/ .mat files upgrade.

* PostProcessing CommonAssets/ .mat files upgrade.

* PostProcessing Scenes/ .mat files upgrade.

* Making intermediate render textures scale with the RenderScale setting when a camera renders to a texture (#6274)

* Fix API is in the wrong state issue (#6331)

* BatchRendererGroup Test Projects Automation (#6276)

* update reference images

* Update HDRP failing test reference images

* Add HDRP Linux Vulkan test images

* Rename UniversalHybridTest to BatchRendererGroup_URP

* Move vulkan win ref images to None folder

* Rename HDRP_HybridTests to BatchRenderGroup_HDRP

* replace hybrid with BRG and add to nightly

* Fix HDRP project name type

* fix typo

* Add .meta files of added reference images

* remove playmode_xr

* Update RenderBRG.cs scripts from hrnext-bugfix

* Update BrgGameojbects hdrp reference images after master merge

* Add vulkan to HDRP brg windows

* use gpu for build, remove osx from ci

* apply patch from the [Yamato] Formatting job

* add BRG to nightly [skip ci]

* remove the hybrid projects from repoconfig

Co-authored-by: MingWai Chan <mingwai@unity3d.com>
Co-authored-by: Tomas Kiniulis <tomas.kiniulis@unity3d.com>
Co-authored-by: Sophia <sophia@unity3d.com>

* Tweaked bloom quality options

* made new settings additional

* Updated docs

* Improving the Bloom Test scene so that it tests Max Iterations, Downscale, Dirt Texture and Dirt Intensity

* Renaming the Downscale enum to BloomDownscaleMode

* Deprecating the skipIterations variable

* Changelog

* Changelog

* Updating bloom reference image for Android GLES3

Co-authored-by: Peter Bay Bastian <pbbastian@users.noreply.github.com>
Co-authored-by: Erik Hakala <59870743+eh-unity@users.noreply.github.com>
Co-authored-by: Théo Penavaire <theo-pnv@users.noreply.github.com>
Co-authored-by: mingwai <cinight@users.noreply.github.com>
Co-authored-by: MingWai Chan <mingwai@unity3d.com>
Co-authored-by: Tomas Kiniulis <tomas.kiniulis@unity3d.com>
Co-authored-by: Sophia <sophia@unity3d.com>
Co-authored-by: Andrem <andrem@unity3d.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants