Skip to content

Add missing shader stages in shader keyword copying #6008

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 4 commits into from
Oct 20, 2021
Merged

Add missing shader stages in shader keyword copying #6008

merged 4 commits into from
Oct 20, 2021

Conversation

FrancescoC-unity
Copy link
Contributor

As reported by @olivierprat , the shader stages were not copied alongside the keyword. This one liner fixes just that

@FrancescoC-unity FrancescoC-unity self-assigned this Oct 13, 2021
@FrancescoC-unity FrancescoC-unity requested a review from a team as a code owner October 13, 2021 14:18
@FrancescoC-unity FrancescoC-unity removed the request for review from alindmanUnity October 13, 2021 14:18
@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)

Shader Graph
/jobDefinition/.yamato%252Fall-shadergraph.yml%2523PR_ShaderGraph_trunk
Depending on your PR, you may also want
/jobDefinition/.yamato%252Fall-shadergraph_builtin_foundation.yml%2523PR_ShaderGraph_BuiltIn_Foundation_trunk
/jobDefinition/.yamato%252Fall-shadergraph_builtin_lighting.yml%2523PR_ShaderGraph_BuiltIn_Lighting_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!

sebastienlagarde
sebastienlagarde approved these changes Oct 15, 2021
View reviewed changes
Copy link
Contributor

@sebastienlagarde sebastienlagarde left a comment

Choose a reason for hiding this comment

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

Please add a changelog

jessebarker
jessebarker approved these changes Oct 18, 2021
View reviewed changes
Copy link
Contributor

@jessebarker jessebarker left a comment

Choose a reason for hiding this comment

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

LGTM

@sebastienlagarde
Copy link
Contributor

Yamato is green with same issue as on master; PR is simple enough and have been validated by Olivier. Merging.

@sebastienlagarde sebastienlagarde merged commit dde0d14 into master Oct 20, 2021
@sebastienlagarde sebastienlagarde deleted the HDRP/fix-missing-stage-copy branch October 20, 2021 14:10
odbb added a commit that referenced this pull request Oct 20, 2021
@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)
sebastienlagarde pushed a commit that referenced this pull request Oct 21, 2021
@FrancescoC-unity @sebastienlagarde
Add missing shader stages in shader keyword copying #6008
b85c189
sebastienlagarde pushed a commit that referenced this pull request Nov 27, 2021
@FrancescoC-unity @sebastienlagarde
Add missing shader stages in shader keyword copying #6008
d63689c
sebastienlagarde added a commit that referenced this pull request Nov 28, 2021
@sebastienlagarde
Revert "Add missing shader stages in shader keyword copying #6008"
ad39847 
This reverts commit d63689c.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jessebarker jessebarker jessebarker approved these changes

@sebastienlagarde sebastienlagarde sebastienlagarde approved these changes

@cdxntchou cdxntchou Awaiting requested review from cdxntchou

@esmelusina esmelusina Awaiting requested review from esmelusina

Assignees

@FrancescoC-unity FrancescoC-unity

Labels
backported-10.x backported-2021.2 HDRP Shader Graph
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@FrancescoC-unity @sebastienlagarde @jessebarker