Skip to content

Commit 5ea1cce

Browse files
committed
Pass the context's texture_thread_info to the render services texture callbacks instead of always passing NULL
1 parent cd6081e commit 5ea1cce

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

src/liboslexec/optexture.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ osl_texture (void *sg_, const char *name, void *handle,
259259
// and ensure that they're being put in aligned memory.
260260
OIIO::simd::float4 result_simd, dresultds_simd, dresultdt_simd;
261261
bool ok = sg->renderer->texture (USTR(name),
262-
(TextureSystem::TextureHandle *)handle, NULL,
262+
(TextureSystem::TextureHandle *)handle, sg->context->texture_thread_info(),
263263
*opt, sg, s, t, dsdx, dtdx, dsdy, dtdy, 4,
264264
(float *)&result_simd,
265265
derivs ? (float *)&dresultds_simd : NULL,
@@ -313,7 +313,7 @@ osl_texture3d (void *sg_, const char *name, void *handle,
313313
// and ensure that they're being put in aligned memory.
314314
OIIO::simd::float4 result_simd, dresultds_simd, dresultdt_simd, dresultdr_simd;
315315
bool ok = sg->renderer->texture3d (USTR(name),
316-
(TextureSystem::TextureHandle *)handle, NULL,
316+
(TextureSystem::TextureHandle *)handle, sg->context->texture_thread_info(),
317317
*opt, sg, P, dPdx, dPdy, dPdz,
318318
4, (float *)&result_simd,
319319
derivs ? (float *)&dresultds_simd : NULL,
@@ -371,7 +371,7 @@ osl_environment (void *sg_, const char *name, void *handle,
371371
OIIO::simd::float4 local_result;
372372
bool ok = sg->renderer->environment (USTR(name),
373373
(TextureSystem::TextureHandle *)handle,
374-
NULL, *opt, sg, R, dRdx, dRdy, 4,
374+
sg->context->texture_thread_info(), *opt, sg, R, dRdx, dRdy, 4,
375375
(float *)&local_result, NULL, NULL,
376376
errormessage);
377377

0 commit comments

Comments
 (0)