Skip to content

Conversation

@johnhaddon
Copy link
Member

And remove broken attempts at support for 1D and 3D samplers.

@johnhaddon johnhaddon self-assigned this Apr 28, 2022
@danieldresser-ie
Copy link
Contributor

Dropping support for 3D and 1D textures would be a problem for Gaffer's ImageGadget, which uses OIIO shaders that use 3D and 1D textures. We load them in by asking the Cortex shader for m_shader->uniformParameter( samplerName )->textureUnit and then manually loading the textures. I know this will break without this code because I just added the 1D support to get that working. If you add back in support for 1D and 3D samplers, this should be fine.

@johnhaddon
Copy link
Member Author

Ah, good catch! Thanks! I'll sort it...

@johnhaddon johnhaddon force-pushed the raytracedViewportSupport branch from 173a72e to fa98495 Compare April 29, 2022 08:55
@johnhaddon
Copy link
Member Author

Should be OK now - I've ditched isSupportedSamplerParameter() and just followed the structure of the original code.

@danieldresser-ie
Copy link
Contributor

LGTM

@johnhaddon johnhaddon merged commit 2820af9 into ImageEngine:main May 3, 2022
@johnhaddon johnhaddon deleted the raytracedViewportSupport branch May 3, 2022 09:43
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.

2 participants