Fix T76044: update Cycles to build with OSL 1.11 master
This commit is contained in:
parent
6cab53eaaa
commit
7d85b6431f
Notes:
blender-bot
2023-02-13 22:45:38 +01:00
Referenced by issue #76044, Cycles update for OSL 1.11
|
@ -1011,7 +1011,13 @@ bool OSLRenderServices::get_userdata(
|
|||
return false; /* disabled by lockgeom */
|
||||
}
|
||||
|
||||
#if OSL_LIBRARY_VERSION_CODE >= 11100
|
||||
TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(ustring filename,
|
||||
OSL::ShadingContext *)
|
||||
#else
|
||||
|
||||
TextureSystem::TextureHandle *OSLRenderServices::get_texture_handle(ustring filename)
|
||||
#endif
|
||||
{
|
||||
OSLTextureHandleMap::iterator it = textures.find(filename);
|
||||
|
||||
|
@ -1365,6 +1371,17 @@ bool OSLRenderServices::environment(ustring filename,
|
|||
return status;
|
||||
}
|
||||
|
||||
#if OSL_LIBRARY_VERSION_CODE >= 11100
|
||||
bool OSLRenderServices::get_texture_info(ustring filename,
|
||||
TextureHandle *texture_handle,
|
||||
TexturePerthread *,
|
||||
OSL::ShadingContext *,
|
||||
int subimage,
|
||||
ustring dataname,
|
||||
TypeDesc datatype,
|
||||
void *data,
|
||||
ustring *)
|
||||
#else
|
||||
bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg,
|
||||
ustring filename,
|
||||
TextureHandle *texture_handle,
|
||||
|
@ -1372,6 +1389,7 @@ bool OSLRenderServices::get_texture_info(OSL::ShaderGlobals *sg,
|
|||
ustring dataname,
|
||||
TypeDesc datatype,
|
||||
void *data)
|
||||
#endif
|
||||
{
|
||||
OSLTextureHandle *handle = (OSLTextureHandle *)texture_handle;
|
||||
|
||||
|
|
|
@ -173,7 +173,12 @@ class OSLRenderServices : public OSL::RendererServices {
|
|||
void *val,
|
||||
bool derivatives) override;
|
||||
|
||||
#if OSL_LIBRARY_VERSION_CODE >= 11100
|
||||
TextureSystem::TextureHandle *get_texture_handle(ustring filename,
|
||||
OSL::ShadingContext *context) override;
|
||||
#else
|
||||
TextureSystem::TextureHandle *get_texture_handle(ustring filename) override;
|
||||
#endif
|
||||
|
||||
bool good(TextureSystem::TextureHandle *texture_handle) override;
|
||||
|
||||
|
@ -224,6 +229,17 @@ class OSLRenderServices : public OSL::RendererServices {
|
|||
float *dresultdt,
|
||||
ustring *errormessage) override;
|
||||
|
||||
#if OSL_LIBRARY_VERSION_CODE >= 11100
|
||||
bool get_texture_info(ustring filename,
|
||||
TextureHandle *texture_handle,
|
||||
TexturePerthread *texture_thread_info,
|
||||
OSL::ShadingContext *shading_context,
|
||||
int subimage,
|
||||
ustring dataname,
|
||||
TypeDesc datatype,
|
||||
void *data,
|
||||
ustring *errormessage) override;
|
||||
#else
|
||||
bool get_texture_info(OSL::ShaderGlobals *sg,
|
||||
ustring filename,
|
||||
TextureHandle *texture_handle,
|
||||
|
@ -231,6 +247,7 @@ class OSLRenderServices : public OSL::RendererServices {
|
|||
ustring dataname,
|
||||
TypeDesc datatype,
|
||||
void *data) override;
|
||||
#endif
|
||||
|
||||
static bool get_background_attribute(
|
||||
KernelGlobals *kg, ShaderData *sd, ustring name, TypeDesc type, bool derivatives, void *val);
|
||||
|
|
Loading…
Reference in New Issue