Cleanup: Remove support for OSL versions < 1.6.

We can get rid of more ifdefs once all platforms are on OSL 1.7 soon.

1 files changed, 0 insertions, 63 deletions

diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 0595282af64..8f3c03602ce 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -852,69 +852,6 @@ bool OSLRenderServices::has_userdata(ustring name, TypeDesc type, OSL::ShaderGlo
 	return false; /* never called by OSL */
 }
 
-#if OSL_LIBRARY_VERSION_CODE < 10600
-bool OSLRenderServices::texture(ustring filename,
-                                TextureOpt &options,
-                                OSL::ShaderGlobals *sg,
-                                float s, float t,
-                                float dsdx, float dtdx,
-                                float dsdy, float dtdy,
-                                float *result)
-{
-	OSL::TextureSystem *ts = osl_ts;
-	ShaderData *sd = (ShaderData *)(sg->renderstate);
-	KernelGlobals *kg = sd->osl_globals;
-	OSLThreadData *tdata = kg->osl_tdata;
-	OIIO::TextureSystem::Perthread *texture_thread_info =
-	       tdata->oiio_thread_info;
-	OIIO::TextureSystem::TextureHandle *texture_handle = NULL;
-	if(filename[0] != '@') {
-		texture_handle = ts->get_texture_handle(filename, texture_thread_info);
-	}
-	return texture(filename,
-	               texture_handle,
-	               texture_thread_info,
-	               options,
-	               sg,
-	               s, t,
-	               dsdx, dtdx, dsdy, dtdy,
-	               options.nchannels,
-	               result,
-	               NULL, NULL);
-}
-
-bool OSLRenderServices::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)
-{
-	OSL::TextureSystem *ts = osl_ts;
-	ShaderData *sd = (ShaderData *)(sg->renderstate);
-	KernelGlobals *kg = sd->osl_globals;
-	OSLThreadData *tdata = kg->osl_tdata;
-	OIIO::TextureSystem::Perthread *texture_thread_info =
-	       tdata->oiio_thread_info;
-	OIIO::TextureSystem::TextureHandle *texture_handle = NULL;
-	if(filename[0] != '@') {
-		texture_handle = ts->get_texture_handle(filename, texture_thread_info);
-	}
-	return texture3d(filename,
-	                 texture_handle,
-	                 texture_thread_info,
-	                 options,
-	                 sg,
-	                 P,
-	                 dPdx, dPdy, dPdz,
-	                 options.nchannels,
-	                 result,
-	                 NULL, NULL, NULL);
-}
-#endif  /* OSL_LIBRARY_VERSION_CODE < 10600 */
-
 bool OSLRenderServices::texture(ustring filename,
                                 TextureHandle *texture_handle,
                                 TexturePerthread *texture_thread_info,