Skip to content

[Master] Making intermediate render textures scale with the RenderScale setting when a camera renders to a texture #6274

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 1 commit into from
Nov 18, 2021
Merged

[Master] Making intermediate render textures scale with the RenderScale setting when a camera renders to a texture #6274

merged 1 commit into from
Nov 18, 2021

Conversation

ellioman
Copy link
Contributor

Purpose of this PR

Fixing issue 1342895.

Currently when a camera has a texture assigned in the "Output Texture" field in the Camera Inspector, intermediate textures such as SSAO, Opaque Texture, etc would not be scaled when the Render Scale setting was set to something other than 1.0. It would only scale those textures when the "Output Texture" was unassigned.

This PR changes that and makes sure the intermediate textures get scaled in those cases as well before we blit to the output texture.

Testing status

Tested locally in the Editor (MAC)

Comments to reviewers

As this is a change in URP Core, we need to test this change thoroughly to make sure it doesn't regress anything.

@ellioman ellioman requested review from a team as code owners November 12, 2021 09:26
@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

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!

@ellioman ellioman requested a review from pbbastian November 16, 2021 10:08
@phi-lira phi-lira changed the base branch from master to universal/staging November 18, 2021 14:38
@phi-lira phi-lira merged commit 3296d5d into universal/staging Nov 18, 2021
@phi-lira phi-lira deleted the universal/bugfix-1342895-renderscale branch November 18, 2021 14:39
phi-lira pushed a commit that referenced this pull request Nov 18, 2021
@ellioman @phi-lira
Making intermediate render textures scale with the RenderScale settin…
0d249a2 
…g when a camera renders to a texture (#6274)
This was referenced Nov 18, 2021
Merged
Merged
gmitrano-unity added a commit that referenced this pull request Nov 29, 2021
@gmitrano-unity
Fix Scene View + Render Scale Logic
f582c1b 
This commit reverses an unintentional change to the scene view's
handling of the render scale setting. This change was introduced
in #6274.

This commit also attempts to consolidate some of the render scale logic
in URP's code by modifying the shader constant logic to query the scaled
camera dimensions directly from the camera target descriptor rather than
calculating them again.
@gmitrano-unity gmitrano-unity mentioned this pull request Nov 29, 2021
Merged
phi-lira added a commit that referenced this pull request Dec 9, 2021
@gmitrano-unity @phi-lira
Fix Scene View + Render Scale Logic (#6423)
a5fae02 
This commit reverses an unintentional change to the scene view's
handling of the render scale setting. This change was introduced
in #6274.

This commit also attempts to consolidate some of the render scale logic
in URP's code by modifying the shader constant logic to query the scaled
camera dimensions directly from the camera target descriptor rather than
calculating them again.

Co-authored-by: Felipe Lira <felipedrl@gmail.com>
ellioman added a commit that referenced this pull request Jan 28, 2022
@ellioman @pbbastian
@eh-unity @cinight @TomasKiniulis @Verasl
[2022.1] Bloom: Downscale & Max Iterations options added (#6369)
96a4abd 
* 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

Reviewers

2 more reviewers

@pbbastian pbbastian pbbastian approved these changes

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

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

universal

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@ellioman @pbbastian @phi-lira