Skip to content
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

Integration - Port fixes from main to RB-2.0 - Adsk Contrib #1752

Merged
merged 5 commits into from
Jan 6, 2023

Conversation

cedrik-fuoco-adsk
Copy link
Contributor

Integration PR

The first commit is the version release type name to empty. Each subsequent commit was cherry-picked from the main branch.

These commits correspond to the following PRs:
Adsk contrib - Fix atan2 argument order for HLSL
Replace texture2D function with texture for GLSL 1.3
Adsk contrib - Processor cache does not detect changes in cccid
Adsk Contrib - Fix inverse Lut1D optimization issue

cedrik-fuoco-adsk and others added 5 commits January 5, 2023 18:27
Signed-off-by: Doug Walker <[email protected]>

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 8a93946)
Signed-off-by: Cédrik Fuoco <[email protected]>
Signed-off-by: Bart Styczen <[email protected]>

Signed-off-by: Bart Styczen <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit d5cedbf)
Signed-off-by: Cédrik Fuoco <[email protected]>
* For Looks that has a FileTransform and for Colorspace with FileTransfrom, add the CCCID to the processor's cache key for that transform.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Removing the workaround in the related unit tests and fixing the issue by adding the environment variable to the context using setStringVar. The processor's cache key is using the context cache ID which has all the context variables taken into account.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Now using addStringVars and creating a new context instead of reusing the one used for the filename.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Adding cccid to the context when there are no context variable.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Adding a few unit tests to test that the processor is different when changing the FileTransform's CCCID.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Using setStringVar to set CCNUM context variable in unit test.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Adding a test in FileTransform to test CollectContextVariables directly.

Signed-off-by: Cédrik Fuoco <[email protected]>

* Minor tweaks for the unit test

Signed-off-by: Cédrik Fuoco <[email protected]>

Signed-off-by: Cédrik Fuoco <[email protected]>
Co-authored-by: Doug Walker <[email protected]>
(cherry picked from commit 4fa7750)
Signed-off-by: Cédrik Fuoco <[email protected]>
Signed-off-by: Doug Walker <[email protected]>

Signed-off-by: Doug Walker <[email protected]>
(cherry picked from commit 5152635)
Signed-off-by: Cédrik Fuoco <[email protected]>
@doug-walker
Copy link
Collaborator

doug-walker commented Jan 6, 2023

Some of the Windows CI jobs failed but we believe this is due to reasons unrelated to this PR since it was happening for previous PRs too. Some of the Windows CI jobs do pass and local Windows builds pass when turning off "Warnings as Errors", so going ahead and merging this.

@doug-walker doug-walker merged commit d2b672f into RB-2.0 Jan 6, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants