Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix compiling with OSL 1.11.8 #2900

Closed
wants to merge 1 commit into from
Closed

Fix compiling with OSL 1.11.8 #2900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/appleseed.shaders/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -403,6 +403,7 @@ foreach (osl_source ${osl_sources})
OUTPUT ${oso_dir}/${oso_filename}
COMMAND ${CMAKE_COMMAND} -E make_directory ${oso_dir}
COMMAND ${PROJECT_SOURCE_DIR}/sandbox/bin/oslc ${OSLC_OPTIONS}
-I"${PROJECT_SOURCE_DIR}/sandbox/shaders/"
Copy link
Author

@ghost ghost Nov 1, 2020 •
edited by ghost
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OSL 1.11.7 and 1.11.8 changed how stdosl.h is looked up: INSTALL_PREFIX/share/OSL/shaders takes precedence over ../shaders (where INSTALL_PREFIX is the compile time path of the installation).

However, if stdosl.h found in the includes it takes the highest precedence.
These changes were introduced in AcademySoftwareFoundation/OpenShadingLanguage#956 and the relevant change can be seen here:
https://github.com/imageworks/OpenShadingLanguage/blob/8ff28a0e062c714b74244cc89fd55461421c5a97/src/liboslcomp/oslcomp.cpp#L334-L341

-I"${PROJECT_SOURCE_DIR}/src/appleseed.shaders/include"
-o "${oso_dir}/${oso_filename}" "${PROJECT_SOURCE_DIR}/src/appleseed.shaders/${osl_source}"
MAIN_DEPENDENCY ${PROJECT_SOURCE_DIR}/src/appleseed.shaders/${osl_source}
Expand Down
8 changes: 8 additions & 0 deletions src/appleseed/foundation/platform/python.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,14 @@
#include "boost/python/detail/wrap_python.hpp" // has to be first, to avoid redefinition warnings
#include "boost/python.hpp"

// wrap_python.hpp undefines _DEBUG and then redefines it without assigning it value of 1
// In OSL 1.11.8 osl/platform.h header uses the syntax "#if _DEBUG" which assumes
// that _DEBUG is not an empty macro, otherwise the header can't be compiled
#ifdef _DEBUG
#undef _DEBUG
#define _DEBUG 1
#endif
Comment on lines +45 to +51
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

So there is a conflit between boost and OSL ?

Why putting this here exactly ? There isn't any OSL include bellow those lines.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes. wrap_python.hpp undefines "_DEBUG" then redefines it as an empty macro.
https://github.com/boostorg/python/blob/f1320bf30b4887aff28b9fc67b98f6f8be8c3684/include/boost/python/detail/wrap_python.hpp#L45
https://github.com/boostorg/python/blob/f1320bf30b4887aff28b9fc67b98f6f8be8c3684/include/boost/python/detail/wrap_python.hpp#L209

I added this here directly after "wrap_python.hpp" to fix the macro definition.
Personally I think that the syntax #if OSL_DEBUG instead of #ifdef OSL_DEBUG used in OSL is suboptimal.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I see. We have some headers in appleseed wich goal is to include another header and then fix some things, like you are doing here. This ensure that the fix will be avilable everywhere we need wrap_python without having to write the fix multiple times.

@dictoon Can you confirm this ? Do you have an example in mind ?


#if defined _MSC_VER
__pragma(warning(pop))
#endif
Expand Down