Skip to content

Conversation

peterjohnlong
Copy link
Contributor

@peterjohnlong peterjohnlong commented Jan 21, 2021

Purpose of this PR

This PR renames some shader variable names where "sample" had been used as the name. "sample" is a reserved word on some platforms and thus would cause a compile error if those shaders were to be compiled there.


Testing status

Tested locally that HDRP-DXR test shaders still compile successfully in DX12.
Tested locally that the affected platform branch, with raytrace shader compile enabled, can now successfully compile and run the HDRP template.


Comments to reviewers

Notes for the reviewers you have assigned.

rename occurrences of sample when used as a shader variable name as this may be a reserved word in certain situatons
@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)
and cancel any jobs that started on Yamato.
See the PR template for more information.
Thank you!

Copy link

@github-actions github-actions bot left a comment

Choose a reason for hiding this comment

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

Welcome to the Unity SRP repo!
Please make sure to fill out the PR template as best you can to give reviewers as much information as possible.
If you have any questions (and you are a Unity employee) go to "#devs-renderpipe"

@peterjohnlong peterjohnlong marked this pull request as draft January 21, 2021 12:25
@peterjohnlong peterjohnlong marked this pull request as ready for review January 21, 2021 12:30
@sebastienlagarde sebastienlagarde merged commit 398aa78 into master Jan 21, 2021
@sebastienlagarde sebastienlagarde deleted the ps5/fixessample branch January 21, 2021 14:45
sebastienlagarde pushed a commit that referenced this pull request Mar 3, 2021
rename occurrences of sample when used as a shader variable name as this may be a reserved word in certain situatons
sebastienlagarde added a commit that referenced this pull request Mar 3, 2021
* Fixed a regression introduced when changing the clamping algorithm for RTR and RTGI (case 1307479). (#3206)

* rename occurrences of sample when used as a variable name (#3216)

rename occurrences of sample when used as a shader variable name as this may be a reserved word in certain situatons

* [HDRP] Update eye sample scene #3227

* Change the tooltip for color shadows and semi-transparent shadows (case 1307704). (#3237)

* [Hdrp] Add 3DS max shader material test (#3239)

* Arnold + Physical material

* auto desk interactive

* Reference image from yamato

* linux vulkan test ref image

* Hdrp/fix 1299233 ies resize #3243

* [HDRP] Fix metal warning + fix reference screenshots + disable unstable metal test #3251

* [HDRP] update some docs based on latest changelog (#3253)

* Update some docs

* Proof read upgrading to 2020.2

* Proof read whats new doc

* Fixed typo

Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>

Co-authored-by: anisunity <42026998+anisunity@users.noreply.github.com>
Co-authored-by: peterjohnlong <73894199+peterjohnlong@users.noreply.github.com>
Co-authored-by: Rémi Chapelain <57442369+remi-chapelain@users.noreply.github.com>
Co-authored-by: skhiat <55133890+skhiat@users.noreply.github.com>
Co-authored-by: Lewis Jordan <lewis.jordan@hotmail.co.uk>
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.

2 participants