diff options
| author | Thomas Dinges <blender@dingto.org> | 2016-02-06 02:07:20 +0300 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2016-02-06 02:07:20 +0300 |
| commit | a6ca8a1b736e098b6c909e5eb23134afb617ff1e (patch) | |
| tree | 8e334dc8ecfca7bf0c26cb30ade2fdfbd8dd056e /intern/cycles/kernel/osl/osl_shader.cpp | |
| parent | 66a9698978d9ca1840b782612250ee77490376b3 (diff) | |
Cleanup: Remove support for OSL versions < 1.6.
We can get rid of more ifdefs once all platforms are on OSL 1.7 soon.
Diffstat (limited to 'intern/cycles/kernel/osl/osl_shader.cpp')
| -rw-r--r-- | intern/cycles/kernel/osl/osl_shader.cpp | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/intern/cycles/kernel/osl/osl_shader.cpp b/intern/cycles/kernel/osl/osl_shader.cpp index 8acc042cd2c..361a88548bd 100644 --- a/intern/cycles/kernel/osl/osl_shader.cpp +++ b/intern/cycles/kernel/osl/osl_shader.cpp @@ -339,11 +339,7 @@ void OSLShader::eval_surface(KernelGlobals *kg, ShaderData *sd, PathState *state int shader = sd->shader & SHADER_MASK; if(kg->osl->surface_state[shader]) { -#if OSL_LIBRARY_VERSION_CODE < 10600 - ss->execute(*octx, *(kg->osl->surface_state[shader]), *globals); -#else ss->execute(octx, *(kg->osl->surface_state[shader]), *globals); -#endif } /* flatten closure tree */ @@ -403,11 +399,7 @@ float3 OSLShader::eval_background(KernelGlobals *kg, ShaderData *sd, PathState * OSL::ShadingContext *octx = tdata->context[(int)ctx]; if(kg->osl->background_state) { -#if OSL_LIBRARY_VERSION_CODE < 10600 - ss->execute(*octx, *(kg->osl->background_state), *globals); -#else ss->execute(octx, *(kg->osl->background_state), *globals); -#endif } /* return background color immediately */ @@ -518,11 +510,7 @@ void OSLShader::eval_volume(KernelGlobals *kg, ShaderData *sd, PathState *state, int shader = sd->shader & SHADER_MASK; if(kg->osl->volume_state[shader]) { -#if OSL_LIBRARY_VERSION_CODE < 10600 - ss->execute(*octx, *(kg->osl->volume_state[shader]), *globals); -#else ss->execute(octx, *(kg->osl->volume_state[shader]), *globals); -#endif } /* flatten closure tree */ @@ -548,11 +536,7 @@ void OSLShader::eval_displacement(KernelGlobals *kg, ShaderData *sd, ShaderConte int shader = sd->shader & SHADER_MASK; if(kg->osl->displacement_state[shader]) { -#if OSL_LIBRARY_VERSION_CODE < 10600 - ss->execute(*octx, *(kg->osl->displacement_state[shader]), *globals); -#else ss->execute(octx, *(kg->osl->displacement_state[shader]), *globals); -#endif } /* get back position */ |