osl compile fails to find headers includ'ed #43561

New Issue

Shane Ambler · 2015-02-04T14:46:58+01:00

Shane Ambler commented

2015-02-04 14:46:58 +01:00

System Information
FreeBSD 10.1 amd64 GTX520

Blender Version
Broken: 2.72+
Worked: 2.71

Short description of error
An osl script that uses #include "xxx.h" to make use of osl header files that ship with blender (inside addons/cycles/shader) fails to compile.

There are 5 files included that an osl script should be able to utilise - node_color.h node_fresnel.h node_texture.h oslutil.h stdosl.h

While stdosl.h is always included, adding it as an include to a script shouldn't break compiling the script.

Exact steps for others to reproduce the error
Compile an osl script within blender that has an #include line.

Fix
Within OSLShaderManager::osl_compile located in intern/cycles/render/osl.cpp the -I option flag and the path it specifies are being added to options as separate items, they need to be added as one string. options is a vector<string_view> so options.push_back() adds a new item to the list, unlike adding characters to the end of a string.

Just due to proximity - the #if test for the use of string and string_view is wrong. vector<string> is used in osl 1.4.x and vector<string_view> is used in osl 1.5.x and higher - included in this patch.

This patch fixes this issue for me.

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 45b4d28..2200eb4 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -251,20 +251,19 @@ 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
+#if OSL_LIBRARY_VERSION_CODE < 10500
 	vector<string> options;
+#else
+	vector<string_view> options;
 #endif
 	string stdosl_path;
-	string shader_path = path_get("shader");
+	string shader_path = path_get("shader").insert(0,"-I");
 
 	/* specify output file name */
 	options.push_back("-o");
 	options.push_back(outputfile);
 
 	/* specify standard include path */
-	options.push_back("-I");
 	options.push_back(shader_path);
 
 	stdosl_path = path_get("shader/stdosl.h");

**System Information** FreeBSD 10.1 amd64 GTX520 **Blender Version** Broken: 2.72+ Worked: 2.71 **Short description of error** An osl script that uses `#include "xxx.h"` to make use of osl header files that ship with blender (inside addons/cycles/shader) fails to compile. There are 5 files included that an osl script should be able to utilise - node_color.h node_fresnel.h node_texture.h oslutil.h stdosl.h While stdosl.h is always included, adding it as an include to a script shouldn't break compiling the script. **Exact steps for others to reproduce the error** Compile an osl script within blender that has an `#include` line. **Fix** Within `OSLShaderManager::osl_compile` located in `intern/cycles/render/osl.cpp` the `-I` option flag and the path it specifies are being added to `options` as separate items, they need to be added as one string. `options` is a `vector<string_view>` so `options.push_back()` adds a new item to the list, unlike adding characters to the end of a string. Just due to proximity - the `#if` test for the use of `string` and `string_view` is wrong. `vector<string>` is used in osl 1.4.x and `vector<string_view>` is used in osl 1.5.x and higher - included in this patch. This patch fixes this issue for me. ``` diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 45b4d28..2200eb4 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -251,20 +251,19 @@ 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 +#if OSL_LIBRARY_VERSION_CODE < 10500 vector<string> options; +#else + vector<string_view> options; #endif string stdosl_path; - string shader_path = path_get("shader"); + string shader_path = path_get("shader").insert(0,"-I"); /* specify output file name */ options.push_back("-o"); options.push_back(outputfile); /* specify standard include path */ - options.push_back("-I"); options.push_back(shader_path); stdosl_path = path_get("shader/stdosl.h"); ```

Shane Ambler commented

2015-02-04 14:46:58 +01:00

Changed status to: 'Open'

Shane Ambler commented

2015-02-04 14:46:58 +01:00

Added subscriber: @sambler

Shane Ambler commented

2015-02-05 04:45:09 +01:00

Added subscriber: @Sergey

Shane Ambler commented

2015-02-05 04:45:10 +01:00

My mistake, osl 1.6 has changed back to vector<string> so the osl test is correct based on the fact that we don't want to support osl < 1.5.12 based on response from @Sergey to D1062

Patch should be -

diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp
index 45b4d28..69fb63d 100644
--- a/intern/cycles/render/osl.cpp
+++ b/intern/cycles/render/osl.cpp
@@ -257,14 +257,13 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output
 	vector<string> options;
 #endif
 	string stdosl_path;
-	string shader_path = path_get("shader");
+	string shader_path = path_get("shader").insert(0,"-I");
 
 	/* specify output file name */
 	options.push_back("-o");
 	options.push_back(outputfile);
 
 	/* specify standard include path */
-	options.push_back("-I");
 	options.push_back(shader_path);
 
 	stdosl_path = path_get("shader/stdosl.h");

My mistake, osl 1.6 has changed back to `vector<string>` so the osl test is correct based on the fact that we don't want to support osl < 1.5.12 based on response from @Sergey to [D1062](https://archive.blender.org/developer/D1062) Patch should be - ``` diff --git a/intern/cycles/render/osl.cpp b/intern/cycles/render/osl.cpp index 45b4d28..69fb63d 100644 --- a/intern/cycles/render/osl.cpp +++ b/intern/cycles/render/osl.cpp @@ -257,14 +257,13 @@ bool OSLShaderManager::osl_compile(const string& inputfile, const string& output vector<string> options; #endif string stdosl_path; - string shader_path = path_get("shader"); + string shader_path = path_get("shader").insert(0,"-I"); /* specify output file name */ options.push_back("-o"); options.push_back(outputfile); /* specify standard include path */ - options.push_back("-I"); options.push_back(shader_path); stdosl_path = path_get("shader/stdosl.h"); ```

blender-admin commented

2015-02-05 08:34:29 +01:00

This issue was referenced by f8c650aa7a

This issue was referenced by f8c650aa7a8fd72a85f9bb1297b02510b089702a

Sergey Sharybin commented

2015-02-05 08:35:29 +01:00

Changed status from 'Open' to: 'Resolved'

Sergey Sharybin closed this issue

2015-02-05 08:35:29 +01:00

Sergey Sharybin commented

2015-02-05 08:35:29 +01:00

Closed by commit f8c650aa7a.