Skip to content

Commit

Permalink
Fixes for recent OIIO TextureSystem API changes (#1476)
Browse files Browse the repository at this point in the history
Changed a function signature in OIIO master that threw us off here
just a tad, as there was no direct type conversion the compiler could
figure out on its own. Easy adjustment gives it the right hint.

Signed-off-by: Larry Gritz <[email protected]>
lgritz authored Mar 15, 2022

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 8c52d48 commit 9b3f15b
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions src/liboslexec/wide/wide_optexture.cpp
Original file line number Diff line number Diff line change
@@ -307,8 +307,8 @@ default_texture3d(BatchedRendererServices* bsr, ustring filename,
const Vec3 dPdz = wdPdz[lane];

retVal = bsr->texturesys()->texture3d(
texture_handle, texture_thread_info, opt, wP[lane], dPdx, dPdy,
dPdz, 4, (float*)&result_simd,
texture_handle, texture_thread_info, opt, Vec3(wP[lane]),
Vec3(dPdx), Vec3(dPdy), dPdz, 4, (float*)&result_simd,
has_derivs ? (float*)&dresultds_simd : nullptr,
has_derivs ? (float*)&dresultdt_simd : nullptr,
has_derivs ? (float*)&dresultdr_simd : nullptr);
@@ -486,10 +486,8 @@ default_environment(BatchedRendererServices* bsr, ustring filename,
const Vec3 dPdy = wdRdy[lane];

retVal = bsr->texturesys()->environment(
texture_handle, texture_thread_info, opt, wR[lane], dPdx, dPdy,
4, (float*)&result_simd,
nullptr,
nullptr);
texture_handle, texture_thread_info, opt, Vec3(wR[lane]),
Vec3(dPdx), Vec3(dPdy), 4, (float*)&result_simd, nullptr, nullptr);

// NOTE: regardless of the value of "retVal" we will always copy over the texture system's results.
// We are relying on the texture system properly filling in missing or fill colors

0 comments on commit 9b3f15b

Please sign in to comment.