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_services.h | |
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_services.h')
-rw-r--r-- | intern/cycles/kernel/osl/osl_services.h | 35 |
1 files changed, 0 insertions, 35 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h index 1d2f1556c3b..2701abb483c 100644 --- a/intern/cycles/kernel/osl/osl_services.h +++ b/intern/cycles/kernel/osl/osl_services.h @@ -93,11 +93,6 @@ public: bool getmessage(OSL::ShaderGlobals *sg, ustring source, ustring name, TypeDesc type, void *val, bool derivatives); -#if OSL_LIBRARY_VERSION_CODE < 10600 - typedef TextureSystem::TextureHandle TextureHandle; - typedef TextureSystem::Perthread TexturePerthread; -#endif - bool texture(ustring filename, TextureSystem::TextureHandle *texture_handle, TexturePerthread *texture_thread_info, @@ -182,36 +177,6 @@ public: static ustring u_v; static ustring u_empty; - /* Code to make OSL versions transition smooth. */ - -#if OSL_LIBRARY_VERSION_CODE < 10600 - bool texture(ustring filename, - TextureOpt &options, - OSL::ShaderGlobals *sg, - float s, float t, - float dsdx, float dtdx, - float dsdy, float dtdy, - float *result); - - bool texture3d(ustring filename, - TextureOpt &options, - OSL::ShaderGlobals *sg, - const OSL::Vec3 &P, - const OSL::Vec3 &dPdx, - const OSL::Vec3 &dPdy, - const OSL::Vec3 &dPdz, - float *result); - - inline bool environment(ustring filename, TextureOpt &options, - OSL::ShaderGlobals *sg, const OSL::Vec3 &R, - const OSL::Vec3 &dRdx, const OSL::Vec3 &dRdy, - float *result) - { - return environment(filename, options, sg, R, dRdx, dRdy, - options.nchannels, result); - } -#endif - private: KernelGlobals *kernel_globals; OSL::TextureSystem *osl_ts; |