diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-04 13:52:41 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-11-04 14:19:45 +0300 |
| commit | ffbd9448c80e3ee6770612280c5534ba24aabe47 (patch) | |
| tree | f1a4173114d698117bd09abd109f455d43e9a91c /intern/cycles/render | |
| parent | d5f978b3ccc7080e442e15f85142b717c47e7e8f (diff) | |
Cycles: Remove compatibility code for OSL-1.4
That code was mainly needed for the transition period, now we've
got all platforms updated to new OSL.
Plus there are some crucial fixes baking in the current upstream
sources which we'll need to have for the next Blender release.
Diffstat (limited to 'intern/cycles/render')
| -rw-r--r-- | intern/cycles/render/osl.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index f57e16471a1..b9180552ac2 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -248,10 +248,6 @@ void OSLShaderManager::shading_system_free() bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile) { -#if OSL_LIBRARY_VERSION_CODE < 10500 - typedef string string_view; -#endif - vector<string_view> options; string stdosl_path; string shader_path = path_get("shader"); @@ -748,11 +744,7 @@ OSL::ShadingAttribStateRef OSLCompiler::compile_type(Shader *shader, ShaderGraph current_type = type; -#if OSL_LIBRARY_VERSION_CODE >= 10501 OSL::ShadingAttribStateRef group = ss->ShaderGroupBegin(shader->name.c_str()); -#else - ss->ShaderGroupBegin(shader->name.c_str()); -#endif ShaderNode *output = graph->output(); set<ShaderNode*> dependencies; @@ -780,13 +772,7 @@ OSL::ShadingAttribStateRef OSLCompiler::compile_type(Shader *shader, ShaderGraph ss->ShaderGroupEnd(); -#if OSL_LIBRARY_VERSION_CODE >= 10501 return group; -#else - OSL::ShadingAttribStateRef group = ss->state(); - ss->clear_state(); - return group; -#endif } void OSLCompiler::compile(OSLGlobals *og, Shader *shader) |