Permalink
Browse files

Move all the public headers to src/include/OSL.

This makes it easier to figure out which headers are public, and makes
the src/include area more closely resemble the installed include area.
  • Loading branch information...
1 parent b0d0789 commit fa3452bad1eb05e61f5543719e5a677f5ac2421d @lgritz lgritz committed Mar 4, 2014
Showing with 113 additions and 118 deletions.
  1. +1 −1 CMakeLists.txt
  2. +4 −7 src/include/CMakeLists.txt
  3. 0 src/include/{ → OSL}/Imathx.h
  4. 0 src/include/{ → OSL}/accum.h
  5. 0 src/include/{ → OSL}/dual.h
  6. 0 src/include/{ → OSL}/dual_vec.h
  7. 0 src/include/{ → OSL}/export.h
  8. 0 src/include/{ → OSL}/genclosure.h
  9. 0 src/include/{ → OSL}/llvm_util.h
  10. 0 src/include/{ → OSL}/matrix22.h
  11. 0 src/include/{ → OSL}/optautomata.h
  12. 0 src/include/{ → OSL}/oslclosure.h
  13. 0 src/include/{ → OSL}/oslcomp.h
  14. 0 src/include/{ → OSL}/oslconfig.h
  15. +3 −3 src/include/{ → OSL}/oslexec.h
  16. 0 src/include/{ → OSL}/oslquery.h
  17. 0 src/include/{ → OSL}/oslversion.h.in
  18. 0 src/include/{ → OSL}/rendererservices.h
  19. 0 src/include/{ → OSL}/shaderglobals.h
  20. +2 −2 src/include/osl_pvt.h
  21. +2 −2 src/liboslcomp/ast.cpp
  22. +2 −3 src/liboslcomp/ast.h
  23. +2 −2 src/liboslcomp/codegen.cpp
  24. +5 −5 src/liboslcomp/oslcomp.cpp
  25. +2 −3 src/liboslcomp/oslcomp_pvt.h
  26. +2 −2 src/liboslcomp/symtab.cpp
  27. +2 −2 src/liboslcomp/symtab.h
  28. +2 −2 src/liboslcomp/typecheck.cpp
  29. +1 −1 src/liboslexec/CMakeLists.txt
  30. +3 −3 src/liboslexec/accum.cpp
  31. +2 −2 src/liboslexec/accum_test.cpp
  32. +1 −1 src/liboslexec/automata.cpp
  33. +1 −1 src/liboslexec/automata.h
  34. +1 −1 src/liboslexec/backendllvm.h
  35. +3 −3 src/liboslexec/closure.cpp
  36. +1 −1 src/liboslexec/constantpool.h
  37. +1 −1 src/liboslexec/constfold.cpp
  38. +2 −2 src/liboslexec/gabornoise.cpp
  39. +2 −2 src/liboslexec/instance.cpp
  40. +1 −1 src/liboslexec/llvm_gen.cpp
  41. +5 −5 src/liboslexec/llvm_ops.cpp
  42. +2 −2 src/liboslexec/llvm_util.cpp
  43. +1 −1 src/liboslexec/llvmutil_test.cpp
  44. +5 −5 src/liboslexec/loadshader.cpp
  45. +2 −2 src/liboslexec/lpeparse.cpp
  46. +3 −3 src/liboslexec/master.cpp
  47. +2 −2 src/liboslexec/noiseimpl.h
  48. +1 −1 src/liboslexec/opclosure.cpp
  49. +1 −1 src/liboslexec/opcolor.cpp
  50. +1 −1 src/liboslexec/opmessage.cpp
  51. +2 −2 src/liboslexec/opnoise.cpp
  52. +1 −1 src/liboslexec/opspline.cpp
  53. +3 −3 src/liboslexec/oslexec.cpp
  54. +2 −2 src/liboslexec/oslexec_pvt.h
  55. +3 −3 src/liboslexec/osoreader.cpp
  56. +1 −1 src/liboslexec/osoreader.h
  57. +3 −3 src/liboslexec/rendservices.cpp
  58. +1 −1 src/liboslexec/shadingsys.cpp
  59. +3 −3 src/liboslexec/typespec.cpp
  60. +2 −2 src/liboslquery/oslquery.cpp
  61. +2 −2 src/oslc/oslcmain.cpp
  62. +1 −1 src/oslinfo/oslinfo.cpp
  63. +2 −2 src/testrender/background.h
  64. +1 −1 src/testrender/optics.h
  65. +2 −2 src/testrender/raytracer.h
  66. +1 −1 src/testrender/sampling.h
  67. +1 −1 src/testrender/shading.cpp
  68. +4 −4 src/testrender/shading.h
  69. +1 −1 src/testrender/simplerend.cpp
  70. +1 −1 src/testrender/simplerend.h
  71. +1 −1 src/testrender/testrender.cpp
  72. +2 −2 src/testshade/simplerend.cpp
  73. +1 −1 src/testshade/simplerend.h
  74. +1 −1 src/testshade/testshade.cpp
View
@@ -194,7 +194,7 @@ include (externalpackages)
include (flexbison)
include_directories (
"${CMAKE_SOURCE_DIR}/src/include"
- "${CMAKE_BINARY_DIR}/include"
+ "${CMAKE_BINARY_DIR}/include/OSL"
"${OPENIMAGEIO_INCLUDES}"
)
View
@@ -1,10 +1,7 @@
-set (public_headers accum.h dual.h dual_vec.h
- export.h genclosure.h Imathx.h llvm_util.h
- matrix22.h optautomata.h oslclosure.h
- oslcomp.h oslconfig.h oslexec.h oslquery.h
- rendererservices.h shaderglobals.h)
+file (GLOB public_headers OSL/*.h)
+
message (STATUS "Create oslversion.h from oslversion.h.in")
-configure_file (oslversion.h.in "${CMAKE_BINARY_DIR}/include/oslversion.h" @ONLY)
-list (APPEND public_headers "${CMAKE_BINARY_DIR}/include/oslversion.h")
+configure_file (OSL/oslversion.h.in "${CMAKE_BINARY_DIR}/include/OSL/oslversion.h" @ONLY)
+list (APPEND public_headers "${CMAKE_BINARY_DIR}/include/OSL/oslversion.h")
INSTALL ( FILES ${public_headers} DESTINATION include/OSL )
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -29,9 +29,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
-#include "oslconfig.h"
-#include "shaderglobals.h"
-#include "rendererservices.h"
+#include "OSL/oslconfig.h"
+#include "OSL/shaderglobals.h"
+#include "OSL/rendererservices.h"
#include <OpenImageIO/refcnt.h>
#include <OpenImageIO/ustring.h>
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -28,9 +28,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
-#include "oslconfig.h"
+#include "OSL/oslconfig.h"
-#include "OpenImageIO/dassert.h"
+#include <OpenImageIO/dassert.h>
OSL_NAMESPACE_ENTER
View
@@ -35,8 +35,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "osl_pvt.h"
#include "oslcomp_pvt.h"
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/strutil.h"
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/strutil.h>
namespace Strutil = OIIO::Strutil;
OSL_NAMESPACE_ENTER
View
@@ -29,10 +29,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#pragma once
#include <boost/intrusive_ptr.hpp>
-#include "OpenImageIO/refcnt.h"
+#include <OpenImageIO/refcnt.h>
-#include "oslconfig.h"
-#include "oslcomp.h"
+#include "OSL/oslcomp.h"
#include "symtab.h"
@@ -34,8 +34,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslcomp_pvt.h"
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/strutil.h"
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/strutil.h>
namespace Strutil = OIIO::Strutil;
View
@@ -40,11 +40,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslcomp_pvt.h"
-#include "OpenImageIO/strutil.h"
-#include "OpenImageIO/sysutil.h"
-#include "OpenImageIO/strutil.h"
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/filesystem.h"
+#include <OpenImageIO/strutil.h>
+#include <OpenImageIO/sysutil.h>
+#include <OpenImageIO/strutil.h>
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/filesystem.h>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
@@ -33,11 +33,10 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <set>
#include <map>
-#include "oslconfig.h"
-#include "oslcomp.h"
+#include "OSL/oslcomp.h"
#include "ast.h"
#include "symtab.h"
-#include "genclosure.h"
+#include "OSL/genclosure.h"
class oslFlexLexer;
@@ -31,8 +31,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslcomp_pvt.h"
-#include "OpenImageIO/strutil.h"
-#include "OpenImageIO/dassert.h"
+#include <OpenImageIO/strutil.h>
+#include <OpenImageIO/dassert.h>
namespace Strutil = OIIO::Strutil;
#include <boost/foreach.hpp>
View
@@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/unordered_map.hpp>
-#include "OpenImageIO/typedesc.h"
-#include "OpenImageIO/ustring.h"
+#include <OpenImageIO/typedesc.h>
+#include <OpenImageIO/ustring.h>
#include "osl_pvt.h"
@@ -31,8 +31,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslcomp_pvt.h"
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/strutil.h"
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/strutil.h>
namespace Strutil = OIIO::Strutil;
#include <boost/foreach.hpp>
@@ -99,7 +99,7 @@ MACRO ( LLVM_COMPILE llvm_src srclist )
${LLVM_COMPILE_FLAGS}
"-I${CMAKE_CURRENT_SOURCE_DIR}"
"-I${CMAKE_SOURCE_DIR}/src/include"
- "-I${CMAKE_BINARY_DIR}/include"
+ "-I${CMAKE_BINARY_DIR}/include/OSL"
"-I${OPENIMAGEIO_INCLUDES}"
"-I${ILMBASE_INCLUDE_DIR}"
"-I${Boost_INCLUDE_DIRS}"
View
@@ -26,10 +26,10 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "accum.h"
+#include "OSL/accum.h"
+#include "OSL/oslclosure.h"
#include "lpeparse.h"
-#include "oslclosure.h"
-#include "OpenImageIO/dassert.h"
+#include <OpenImageIO/dassert.h>
OSL_NAMESPACE_ENTER
@@ -26,8 +26,8 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include "accum.h"
-#include "oslclosure.h"
+#include "OSL/accum.h"
+#include "OSL/oslclosure.h"
using namespace OSL;
@@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "automata.h"
-#include "optautomata.h"
+#include "OSL/optautomata.h"
#include <algorithm>
#include <cstdio>
@@ -36,7 +36,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/unordered_map.hpp>
#include <boost/unordered_set.hpp>
-#include "oslconfig.h"
+#include "OSL/oslconfig.h"
OSL_NAMESPACE_ENTER
@@ -36,7 +36,7 @@ using namespace OSL;
using namespace OSL::pvt;
#include "runtimeoptimize.h"
-#include "llvm_util.h"
+#include "OSL/llvm_util.h"
@@ -33,9 +33,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <OpenImageIO/dassert.h>
#include <OpenImageIO/sysutil.h>
-#include "oslconfig.h"
-#include "oslclosure.h"
-#include "genclosure.h"
+#include "OSL/oslconfig.h"
+#include "OSL/oslclosure.h"
+#include "OSL/genclosure.h"
#include "oslexec_pvt.h"
@@ -32,7 +32,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <list>
#include <boost/foreach.hpp>
-#include "OpenImageIO/thread.h"
+#include <OpenImageIO/thread.h>
using namespace OSL;
using namespace OSL::pvt;
@@ -37,7 +37,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslexec_pvt.h"
#include "runtimeoptimize.h"
-#include "dual.h"
+#include "OSL/dual.h"
#include "noiseimpl.h"
using namespace OSL;
using namespace OSL::pvt;
@@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslexec_pvt.h"
#include "noiseimpl.h"
-#include "dual_vec.h"
-#include "Imathx.h"
+#include "OSL/dual_vec.h"
+#include "OSL/Imathx.h"
#include <OpenImageIO/fmath.h>
@@ -33,8 +33,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/foreach.hpp>
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/strutil.h"
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/strutil.h>
#include "oslexec_pvt.h"
@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <OpenImageIO/fmath.h>
#include "oslexec_pvt.h"
-#include "genclosure.h"
+#include "OSL/genclosure.h"
#include "backendllvm.h"
using namespace OSL;
@@ -93,13 +93,13 @@ examples), as you are just coding in C++, but there are some rules:
#include <iostream>
-#include "oslconfig.h"
-#include "rendererservices.h"
-#include "shaderglobals.h"
-#include "dual.h"
+#include "OSL/oslconfig.h"
+#include "OSL/rendererservices.h"
+#include "OSL/shaderglobals.h"
+#include "OSL/dual.h"
+#include "OSL/dual_vec.h"
using namespace OSL;
-#include <dual_vec.h>
#include <OpenEXR/ImathFun.h>
#include <OpenImageIO/fmath.h>
@@ -29,8 +29,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <OpenImageIO/thread.h>
-#include "oslconfig.h"
-#include "llvm_util.h"
+#include "OSL/oslconfig.h"
+#include "OSL/llvm_util.h"
#ifndef USE_MCJIT
#define USE_MCJIT 0
@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <OpenImageIO/typedesc.h>
#include <OpenImageIO/ustring.h>
#include <OpenImageIO/dassert.h>
-#include "llvm_util.h"
+#include "OSL/llvm_util.h"
@@ -36,11 +36,11 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/algorithm/string.hpp>
-#include "OpenImageIO/strutil.h"
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/timer.h"
-#include "OpenImageIO/thread.h"
-#include "OpenImageIO/filesystem.h"
+#include <OpenImageIO/strutil.h>
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/timer.h>
+#include <OpenImageIO/thread.h>
+#include <OpenImageIO/filesystem.h>
@@ -27,8 +27,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "lpeparse.h"
-#include "oslclosure.h"
-#include "OpenImageIO/dassert.h"
+#include "OSL/oslclosure.h"
+#include <OpenImageIO/dassert.h>
OSL_NAMESPACE_ENTER
@@ -34,9 +34,9 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <boost/foreach.hpp>
-#include "OpenImageIO/strutil.h"
-#include "OpenImageIO/dassert.h"
-#include "OpenImageIO/thread.h"
+#include <OpenImageIO/strutil.h>
+#include <OpenImageIO/dassert.h>
+#include <OpenImageIO/thread.h>
#include "oslexec_pvt.h"
#include "../liboslcomp/oslcomp_pvt.h"
@@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <limits>
-#include "dual.h"
-#include "dual_vec.h"
+#include "OSL/dual.h"
+#include "OSL/dual_vec.h"
#include "oslexec_pvt.h"
#include <OpenImageIO/hash.h>
@@ -30,7 +30,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cmath>
#include "oslexec_pvt.h"
-#include "genclosure.h"
+#include "OSL/genclosure.h"
OSL_NAMESPACE_ENTER
@@ -40,7 +40,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <cmath>
#include "oslexec_pvt.h"
-#include "dual.h"
+#include "OSL/dual.h"
#ifdef _MSC_VER
using OIIO::expm1;
@@ -27,7 +27,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "oslexec_pvt.h"
-#include "shaderglobals.h"
+#include "OSL/shaderglobals.h"
/////////////////////////////////////////////////////////////////////////
@@ -30,8 +30,8 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "oslexec_pvt.h"
#include "noiseimpl.h"
-#include "dual_vec.h"
-#include "Imathx.h"
+#include "OSL/dual_vec.h"
+#include "OSL/Imathx.h"
#include <OpenImageIO/fmath.h>
Oops, something went wrong.

0 comments on commit fa3452b

Please sign in to comment.