Skip to content

Re-enabled URP debug view shader code following a HLSLcc fix #6027

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 3 commits into from
Oct 26, 2021
Merged

Re-enabled URP debug view shader code following a HLSLcc fix #6027

merged 3 commits into from
Oct 26, 2021

Conversation

arttu-peltonen
Copy link
Contributor

@arttu-peltonen arttu-peltonen commented Oct 15, 2021 •
edited
Loading

Purpose of this PR

This bug has been fixed in 22.1.0a13: https://fogbugz.unity3d.com/f/cases/1334240/, so I can now re-enable code that was disabled on VK/GL due to the bug.

Testing status

Tested locally using the repro project on the ticket. With engine build before the fix, the shader error reproduces, and after the fix it no longer occurs.

Note to QA: If you want to test yourself, use latest trunk or at least 2022.1.0a13.

Note: Needs backport to 2021.2, but backporter must make sure this ono PR has landed in 21.2/staging before backporting this PR.

@github-actions
Copy link

github-actions bot commented Oct 15, 2021 •
edited
Loading

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.

@arttu-peltonen
Copy link
Contributor Author

arttu-peltonen commented Oct 15, 2021 •
edited
Loading

NOTE Keeping this as draft while I wait for 22.1.0a13 to appear in saihai, so that "minimum version" Yamato jobs will pass.` Graphics packages no longer verify minimum version.

@arttu-peltonen arttu-peltonen self-assigned this Oct 15, 2021
erikabar
erikabar approved these changes Oct 18, 2021
View reviewed changes
Copy link
Contributor

@erikabar erikabar left a comment

Choose a reason for hiding this comment

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

developer already tested it, approving without additional coverage

@arttu-peltonen arttu-peltonen requested review from martint-unity and removed request for ellioman October 18, 2021 11:43
@arttu-peltonen arttu-peltonen force-pushed the rpw/restore-urp-debug-lighting-modes-vk-gl branch from 2e65531 to 66f21ef Compare October 22, 2021 11:37
@arttu-peltonen arttu-peltonen force-pushed the rpw/restore-urp-debug-lighting-modes-vk-gl branch from 66f21ef to 1e5338d Compare October 25, 2021 07:32
@arttu-peltonen arttu-peltonen changed the base branch from master to universal/staging October 25, 2021 07:36
@arttu-peltonen arttu-peltonen removed the request for review from sebastienlagarde October 25, 2021 07:37
@arttu-peltonen arttu-peltonen marked this pull request as ready for review October 25, 2021 07:45
@arttu-peltonen arttu-peltonen requested review from a team as code owners October 25, 2021 07:45
@arttu-peltonen arttu-peltonen removed the request for review from a team October 25, 2021 07:56
Nzollner
Nzollner approved these changes Oct 25, 2021
View reviewed changes
Copy link
Contributor

@Nzollner Nzollner left a comment

Choose a reason for hiding this comment

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

LGTM

@phi-lira phi-lira merged commit d219b41 into universal/staging Oct 26, 2021
@phi-lira phi-lira deleted the rpw/restore-urp-debug-lighting-modes-vk-gl branch October 26, 2021 15:09
@arttu-peltonen arttu-peltonen mentioned this pull request Oct 28, 2021
Merged
phi-lira added a commit that referenced this pull request Nov 9, 2021
@arttu-peltonen @phi-lira
Re-enabled URP debug view shader code following a HLSLcc fix (#6027)
676d7b1 
* Remove ifdef that disabled debug shader functionality due to HLSLcc bug.

- This was fixed in https://ono.unity3d.com/unity/unity/pull-request/132203/_/graphics/shadersystem/minor_fixes_0003

* Changelog

Co-authored-by: Felipe Lira <felipedrl@gmail.com>
@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

@Nzollner Nzollner Nzollner approved these changes

+2 more reviewers

@martint-unity martint-unity martint-unity approved these changes

@erikabar erikabar erikabar approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

@arttu-peltonen arttu-peltonen

Labels

needs-backport-2021.2 universal

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@arttu-peltonen @Nzollner @martint-unity @erikabar @phi-lira