Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cleanup: Remove support for OSL versions < 1.6.

Browse Source 
We can get rid of more ifdefs once all platforms are on OSL 1.7 soon.
This commit is contained in:
Thomas Dinges
2016-02-06 00:07:20 +01:00
parent 66a9698978
commit a6ca8a1b73
4 changed files with 0 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
intern/cycles/render/osl.cpp
View File

@@ -264,11 +264,7 @@ void OSLShaderManager::shading_system_free()
bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile)
{
#if OSL_LIBRARY_VERSION_CODE < 10602
vector<string_view> options;
#else
vector<string> options;
#endif
string stdosl_path;
string shader_path = path_get("shader");
@@ -283,11 +279,7 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output
stdosl_path = path_get("shader/stdosl.h");
/* compile */
#if OSL_LIBRARY_VERSION_CODE >= 10602
OSL::OSLCompiler *compiler = new OSL::OSLCompiler(&OSL::ErrorHandler::default_handler());
#else
OSL::OSLCompiler *compiler = new OSL::OSLCompiler();
#endif
bool ok = compiler->compile(string_view(inputfile), options, string_view(stdosl_path));
delete compiler;