Skip to content

CI : Update to Cortex 10.6.6.0#6983

Merged
johnhaddon merged 4 commits into
1.6_maintenancefrom
oslUSDConformance
Jun 22, 2026
Merged

CI : Update to Cortex 10.6.6.0#6983
johnhaddon merged 4 commits into
1.6_maintenancefrom
oslUSDConformance

Conversation

@johnhaddon

Copy link
Copy Markdown
Member

Cortex 10.6.6.0 doesn't actually exist yet, but it will when ImageEngine/cortex#1540 gets merged. This PR contains the necessary changes to adapt Gaffer for the new IECOREUSD_WRITE_CONFORMANT_OSL_SHADERS option it provides.

- Test for duplicates at the file rather than directory level. This copes with situations where one search path is nested inside another.
- Call `resolve()` so that if two different search paths refer to the same directory (perhaps by symlinks), we don't process them both.
@johnhaddon johnhaddon self-assigned this Jun 19, 2026
@github-project-automation github-project-automation Bot moved this to Pending Review in Work in Progress Jun 19, 2026
@johnhaddon johnhaddon changed the base branch from main to 1.6_maintenance June 19, 2026 16:07
@murraystevenson

Copy link
Copy Markdown
Contributor

Changes look good to me. I've pushed a pair of fixups to update to the newly released Cortex 10.6.6.0 and update the expected warning message in ShadingEngineTest.testWarningForInvalidShaders.

It can't be relied upon for shaders loaded from USD, and we are trying to phase out its usage entirely.
@johnhaddon johnhaddon merged commit 0c5ae33 into 1.6_maintenance Jun 22, 2026
2 of 6 checks passed
@github-project-automation github-project-automation Bot moved this from Pending Review to Pending release in Work in Progress Jun 22, 2026
@johnhaddon johnhaddon deleted the oslUSDConformance branch July 1, 2026 16:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

Archived in project

Development

Successfully merging this pull request may close these issues.

2 participants