-
Notifications
You must be signed in to change notification settings - Fork 373
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.
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
testrender: Implement basic displacement shader support #1898
testrender: Implement basic displacement shader support #1898
Conversation
Looks like I need to grab updated reference images from the CI machine. In any case, this PR should be reviewed after we get #1897 merged. |
Update: I've merged #1897 now, so you ought to be able to rebase on top of it in main. |
fc3c72b
to
663e1fb
Compare
663e1fb
to
9f18135
Compare
I took the liberty of rebasing this on top of the current main, fixing the formatting problems, and adding one more reference image, and now we are passing all CI but the icx (I think that will need another reference image, checking...) and the gpu test. The GPU one is tricky -- this PR breaks the build when OptiX is enabled. It's because of the change of SimpleRaytracer::m_shaders from a ShaderGroupRef to a |
I believe I've updated now with a fixed icx reference image. So the only remaining problem with this PR is the build break when enabling OptiX. Is this something you're able to look at, @fpsunflower ? |
Yes, sorry I had started to look into this over the break and then got distracted. I'll pick up where you left off. |
Thanks, Chris. I think I at least got a bunch of other distractions out of your way. |
Associate an (optional) displacement shader with each material. On startup, we execute the displacement for each face-vertex that has a valid displacement shader assigned. Signed-off-by: Chris Kulla <ckulla@gmail.com>
Signed-off-by: Larry Gritz <lg@larrygritz.com>
Signed-off-by: Larry Gritz <lg@larrygritz.com>
Signed-off-by: Larry Gritz <lg@larrygritz.com> testrender: Implement basic displacement shader support Associate an (optional) displacement shader with each material. On startup, we execute the displacement for each face-vertex that has a valid displacement shader assigned. Signed-off-by: Chris Kulla <ckulla@gmail.com>
Signed-off-by: Chris Kulla <ckulla@gmail.com>
Signed-off-by: Chris Kulla <ckulla@gmail.com>
6c2f2dd
to
a2d6c5e
Compare
Signed-off-by: Chris Kulla <ckulla@gmail.com>
Signed-off-by: Chris Kulla <ckulla@gmail.com>
Alright this should be good to go now. I believe the OptiX side is hooked up correctly, though I don't have a setup to run it here. |
It's really unfortunate that our CI can't (yet) do OptiX tests. Turns out that we had two somewhat recent changes that broke the CI tests on OptiX and needed minor updates. I have fixes in #1926 (posted yesterday and merged this morning) and #1927 (just posted and awaiting review). I can confirm that with the addition of those, your patch here fully build and passes all tests with OptiX, so it's ready to merge! |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks great!
There were still some remaining failed tests when I tried it, but they were unrelated to your changes and I have separate patches that address them.
Description
Associate an (optional) displacement shader with each material. On startup, we execute the displacement for each face-vertex that has a valid displacement shader assigned.
Tests
Added a new test with a displaced sphere to show how this works.
Checklist:
already run clang-format v17 before submitting, I definitely will look at
the CI test that runs clang-format and fix anything that it highlights as
being nonconforming.