Reduce Imath footprint even more #3332
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
There was that one pesky place where we were still including Imath headers, from simd.h in the case where OIIO_SIMD==0 and we wanted to fall back on some Imath::Matrix methods. Ugh, but this backfired because when including this file from Cuda, OIIO_SIMD==0 and it included the header. But what happens if a downstream app (a) includes this file from Cuda, and (b) uses a DIFFERENT Imath (so names clash) or doesn't want to use Imath at all? So one more change: * Remove the include of Imath.h from simd.h entirely. * Most places where we fell back on the Imath::Matrix methods, just replace it with scalar code, it's not complicated. (For some technical reasons, this required some minor surgery on the matrix44 class, but not anything that changes anything from a caller's point of view.) * The one complicated case is matrix44::inverse(). Punt! Just let that only be implemented if either (a) there is SIMD available, or (b) there is Imath available (i.e., included by the downstream code prior to this header). That's it. If you want to invert a 4x4 matrix without SIMD, you need to arrange inclusion of the correct ImathMatrix.h yourself before including this header.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was that one pesky place where we were still including Imath
headers, from simd.h in the case where OIIO_SIMD==0 and we wanted to
fall back on some Imath::Matrix methods.
Ugh, but this backfired because when including this file from Cuda,
OIIO_SIMD==0 and it included the header. But what happens if a
downstream app (a) includes this file from Cuda, and (b) uses a
DIFFERENT Imath (so names clash) or doesn't want to use Imath at all?
So one more change:
Remove the include of Imath.h from simd.h entirely.
Most places where we fell back on the Imath::Matrix methods, just
replace it with scalar code, it's not complicated. (For some technical
reasons, this required some minor surgery on the matrix44 class, but
not anything that changes anything from a caller's point of view.)
The one complicated case is matrix44::inverse(). Punt! Just let that
only be implemented if either (a) there is SIMD available, or (b)
there is Imath available (i.e., included by the downstream code
prior to this header). That's it. If you want to invert a 4x4 matrix
without SIMD, you need to arrange inclusion of the correct
ImathMatrix.h yourself before including this header.