API tools faq
paste
Advertisement
Guest User

bartus

a guest
Oct 3rd, 2017
153
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 12.85 KB | None | 0 0
raw download clone embed print report
  1. diff --git a/CMakeLists.txt b/CMakeLists.txt
  2. index b1da2089d..b05c8e48f 100644
  3. --- a/CMakeLists.txt
  4. +++ b/CMakeLists.txt
  5. @@ -22,7 +22,7 @@ SET(EMBREE_VERSION ${EMBREE_VERSION_MAJOR}.${EMBREE_VERSION_MINOR}.${EMBREE_VERS
  6. MATH(EXPR EMBREE_VERSION_NUMBER "10000*${EMBREE_VERSION_MAJOR} + 100*${EMBREE_VERSION_MINOR} + ${EMBREE_VERSION_PATCH}")
  7. SET(CPACK_RPM_PACKAGE_RELEASE 1)
  8.  
  9. -PROJECT(embree${EMBREE_VERSION_MAJOR})
  10. +PROJECT(embree${EMBREE_VERSION_MAJOR}-bvh)
  11.  
  12. CMAKE_MINIMUM_REQUIRED(VERSION 2.8.11)
  13.  
  14. diff --git a/README.md b/README.md
  15. index 3066ea9ac..cbd5729f2 100644
  16. --- a/README.md
  17. +++ b/README.md
  18. @@ -570,13 +570,13 @@ only differences are that the ISPC version needs some ISPC specific
  19. uniform type modifiers, and limits the ray packets to the native SIMD
  20. size the ISPC code is compiled for.
  21.  
  22. -The user is supposed to include the `embree2/rtcore.h`, and the
  23. -`embree2/rtcore_ray.h` file, but none of the other header files. If
  24. +The user is supposed to include the `embree2-bvh/rtcore.h`, and the
  25. +`embree2-bvh/rtcore_ray.h` file, but none of the other header files. If
  26. using the ISPC version of the API, the user should include
  27. -`embree2/rtcore.isph` and `embree2/rtcore_ray.isph`.
  28. +`embree2-bvh/rtcore.isph` and `embree2/rtcore_ray.isph`.
  29.  
  30. - #include <embree2/rtcore.h>
  31. - #include <embree2/rtcore_ray.h>
  32. + #include <embree2-bvh/rtcore.h>
  33. + #include <embree2-bvh/rtcore_ray.h>
  34.  
  35. All API calls carry the prefix `rtc` which stands for **r**ay
  36. **t**racing **c**ore. Embree supports a device concept, which allows
  37. @@ -1331,7 +1331,7 @@ segment and the scene exists (`rtcOccluded` functions).
  38. void rtcOccluded16 (const void* valid, RTCScene scene, RTCRay16& ray);
  39.  
  40. The ray layout to be passed to the ray tracing core is defined in the
  41. -`embree2/rtcore_ray.h` header file. It is up to the user if he wants
  42. +`embree2-bvh/rtcore_ray.h` header file. It is up to the user if he wants
  43. to use the ray structures defined in that file, or resemble the exact
  44. same binary data layout with their own vector classes. The ray layout
  45. might change with new Embree releases as new features get added,
  46. diff --git a/common/cmake/package.cmake b/common/cmake/package.cmake
  47. index 563346d3f..0577b02b7 100644
  48. --- a/common/cmake/package.cmake
  49. +++ b/common/cmake/package.cmake
  50. @@ -17,8 +17,8 @@
  51. INCLUDE(GNUInstallDirs)
  52.  
  53. IF (NOT RTCORE_ZIP_MODE AND NOT WIN32 AND NOT APPLE)
  54. - SET(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR}/embree${EMBREE_VERSION_MAJOR})
  55. - SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR}/embree${EMBREE_VERSION_MAJOR})
  56. + SET(CMAKE_INSTALL_BINDIR ${CMAKE_INSTALL_BINDIR}/embree${EMBREE_VERSION_MAJOR}-bvh)
  57. + SET(CMAKE_INSTALL_FULL_BINDIR ${CMAKE_INSTALL_FULL_BINDIR}/embree${EMBREE_VERSION_MAJOR}-bvh)
  58. ENDIF()
  59.  
  60. SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
  61. @@ -27,16 +27,16 @@ SET(CMAKE_INSTALL_NAME_DIR ${CMAKE_INSTALL_FULL_LIBDIR})
  62. # Install Headers
  63. ##############################################################
  64.  
  65. -INSTALL(DIRECTORY include/embree2 DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT devel)
  66. -CONFIGURE_FILE(include/embree2/rtcore.h rtcore.h @ONLY)
  67. -CONFIGURE_FILE(include/embree2/rtcore.isph rtcore.isph @ONLY)
  68. -INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embree2 COMPONENT devel)
  69. -INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.isph DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embree2 COMPONENT devel)
  70. +INSTALL(DIRECTORY include/embree2-bvh DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} COMPONENT devel)
  71. +CONFIGURE_FILE(include/embree2-bvh/rtcore.h rtcore.h @ONLY)
  72. +CONFIGURE_FILE(include/embree2-bvh/rtcore.isph rtcore.isph @ONLY)
  73. +INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embree2-bvh COMPONENT devel)
  74. +INSTALL(FILES ${PROJECT_BINARY_DIR}/rtcore.isph DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/embree2-bvh COMPONENT devel)
  75.  
  76. ##############################################################
  77. # Install Models
  78. ##############################################################
  79. -INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
  80. +#INSTALL(DIRECTORY tutorials/models DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT examples)
  81.  
  82. ##############################################################
  83. # Install Documentation
  84. diff --git a/kernels/common/acceln.cpp b/kernels/common/acceln.cpp
  85. index 64cdff443..dc0394c95 100644
  86. --- a/kernels/common/acceln.cpp
  87. +++ b/kernels/common/acceln.cpp
  88. @@ -15,7 +15,7 @@
  89. // ======================================================================== //
  90.  
  91. #include "acceln.h"
  92. -#include "../../include/embree2/rtcore_ray.h"
  93. +#include "../../include/embree2-bvh/rtcore_ray.h"
  94. #include "../algorithms/parallel_for.h"
  95.  
  96. namespace embree
  97. diff --git a/kernels/common/raystream_log.h b/kernels/common/raystream_log.h
  98. index 2590be52f..191045539 100644
  99. --- a/kernels/common/raystream_log.h
  100. +++ b/kernels/common/raystream_log.h
  101. @@ -17,7 +17,7 @@
  102. #pragma once
  103.  
  104. #include "default.h"
  105. -#include "../../include/embree2/rtcore_ray.h"
  106. +#include "../../include/embree2-bvh/rtcore_ray.h"
  107.  
  108. namespace embree
  109. {
  110. diff --git a/kernels/common/rtcore.h b/kernels/common/rtcore.h
  111. index 79f13a98e..5c88336a8 100644
  112. --- a/kernels/common/rtcore.h
  113. +++ b/kernels/common/rtcore.h
  114. @@ -14,7 +14,7 @@
  115. // limitations under the License. //
  116. // ======================================================================== //
  117.  
  118. -#include "../../include/embree2/rtcore.h"
  119. +#include "../../include/embree2-bvh/rtcore.h"
  120.  
  121. namespace embree
  122. {
  123. diff --git a/kernels/common/rtcore_bvh_builder.cpp b/kernels/common/rtcore_bvh_builder.cpp
  124. index 0ef4f67ee..b95d02b16 100644
  125. --- a/kernels/common/rtcore_bvh_builder.cpp
  126. +++ b/kernels/common/rtcore_bvh_builder.cpp
  127. @@ -20,8 +20,8 @@
  128. # define RTCORE_API extern "C" __attribute__ ((visibility ("default")))
  129. #endif
  130.  
  131. -#include "../../include/embree2/rtcore.h"
  132. -#include "../../include/embree2/rtcore_bvh_builder.h"
  133. +#include "../../include/embree2-bvh/rtcore.h"
  134. +#include "../../include/embree2-bvh/rtcore_bvh_builder.h"
  135.  
  136. #include "alloc.h"
  137. #include "../xeon/builders/bvh_builder_sah.h"
  138. diff --git a/kernels/common/rtcore_ispc.ispc b/kernels/common/rtcore_ispc.ispc
  139. index 434153dc4..7ae65512e 100644
  140. --- a/kernels/common/rtcore_ispc.ispc
  141. +++ b/kernels/common/rtcore_ispc.ispc
  142. @@ -14,7 +14,7 @@
  143. // limitations under the License. //
  144. // ======================================================================== //
  145.  
  146. -#include "../../include/embree2/rtcore.isph"
  147. +#include "../../include/embree2-bvh/rtcore.isph"
  148.  
  149. #define size_tt int // FIXME: workaround of ISPC bug
  150. #define ssize_tt int // FIXME: workaround of ISPC bug
  151. diff --git a/tests/benchmark.cpp b/tests/benchmark.cpp
  152. index 13241e6e1..e0e5b98f2 100644
  153. --- a/tests/benchmark.cpp
  154. +++ b/tests/benchmark.cpp
  155. @@ -14,8 +14,8 @@
  156. // limitations under the License. //
  157. // ======================================================================== //
  158.  
  159. -#include "../include/embree2/rtcore.h"
  160. -#include "../include/embree2/rtcore_ray.h"
  161. +#include "../include/embree2-bvh/rtcore.h"
  162. +#include "../include/embree2-bvh/rtcore_ray.h"
  163. #include "../kernels/common/default.h"
  164. #include "../kernels/algorithms/parallel_for.h"
  165. #include <vector>
  166. diff --git a/tests/retrace.cpp b/tests/retrace.cpp
  167. index ab8aa0f82..7f96c7807 100644
  168. --- a/tests/retrace.cpp
  169. +++ b/tests/retrace.cpp
  170. @@ -14,8 +14,8 @@
  171. // limitations under the License. //
  172. // ======================================================================== //
  173.  
  174. -#include "../include/embree2/rtcore.h"
  175. -#include "../include/embree2/rtcore_ray.h"
  176. +#include "../include/embree2-bvh/rtcore.h"
  177. +#include "../include/embree2-bvh/rtcore_ray.h"
  178. #include "../kernels/common/default.h"
  179. #include "../kernels/common/raystream_log.h"
  180. #include <vector>
  181. diff --git a/tests/verify.cpp b/tests/verify.cpp
  182. index bb523ace4..cfb208866 100755
  183. --- a/tests/verify.cpp
  184. +++ b/tests/verify.cpp
  185. @@ -14,8 +14,8 @@
  186. // limitations under the License. //
  187. // ======================================================================== //
  188.  
  189. -#include "../include/embree2/rtcore.h"
  190. -#include "../include/embree2/rtcore_ray.h"
  191. +#include "../include/embree2-bvh/rtcore.h"
  192. +#include "../include/embree2-bvh/rtcore_ray.h"
  193. #include "../kernels/common/default.h"
  194. #include <vector>
  195. #include <cstddef>
  196. diff --git a/tutorials/bvh_access/bvh_access.cpp b/tutorials/bvh_access/bvh_access.cpp
  197. index ac5d17cb7..0dbb0253b 100644
  198. --- a/tutorials/bvh_access/bvh_access.cpp
  199. +++ b/tutorials/bvh_access/bvh_access.cpp
  200. @@ -15,7 +15,7 @@
  201. // ======================================================================== //
  202.  
  203. #include "../common/tutorial/tutorial.h"
  204. -#include "../../include/embree2/rtcore.h"
  205. +#include "../../include/embree2-bvh/rtcore.h"
  206. #include "../../kernels/xeon/bvh/bvh.h"
  207. #include "../../kernels/xeon/geometry/trianglev.h"
  208.  
  209. diff --git a/tutorials/bvh_builder_rtc/bvh_builder_rtc_device.cpp b/tutorials/bvh_builder_rtc/bvh_builder_rtc_device.cpp
  210. index fe1c62a20..dec64c71b 100644
  211. --- a/tutorials/bvh_builder_rtc/bvh_builder_rtc_device.cpp
  212. +++ b/tutorials/bvh_builder_rtc/bvh_builder_rtc_device.cpp
  213. @@ -18,7 +18,7 @@
  214.  
  215. #include "../common/tutorial/tutorial_device.h"
  216. #include "../../kernels/common/alloc.h"
  217. -#include "../../include/embree2/rtcore_bvh_builder.h"
  218. +#include "../../include/embree2-bvh/rtcore_bvh_builder.h"
  219.  
  220. RTCDevice g_device = nullptr;
  221. RTCScene g_scene = nullptr;
  222. diff --git a/tutorials/common/tutorial/tutorial_device.h b/tutorials/common/tutorial/tutorial_device.h
  223. index 969d47853..c4236352a 100644
  224. --- a/tutorials/common/tutorial/tutorial_device.h
  225. +++ b/tutorials/common/tutorial/tutorial_device.h
  226. @@ -29,7 +29,7 @@ struct Vertex { float x,y,z,r; };
  227. struct Triangle { int v0, v1, v2; };
  228. struct Quad { int v0, v1, v2, v3; };
  229.  
  230. -#include "../../../include/embree2/rtcore.h"
  231. +#include "../../../include/embree2-bvh/rtcore.h"
  232. #include "ray.h"
  233.  
  234. #include "scene.h"
  235. diff --git a/tutorials/common/tutorial/tutorial_device.isph b/tutorials/common/tutorial/tutorial_device.isph
  236. index ccbf43478..6c8c47d7a 100644
  237. --- a/tutorials/common/tutorial/tutorial_device.isph
  238. +++ b/tutorials/common/tutorial/tutorial_device.isph
  239. @@ -32,7 +32,7 @@ struct Triangle { int v0, v1, v2; };
  240. #include "scene_device.isph"
  241.  
  242. /* include embree API */
  243. -#include "../../../include/embree2/rtcore.isph"
  244. +#include "../../../include/embree2-bvh/rtcore.isph"
  245.  
  246. /* returns time stamp counter */
  247. extern "C" uniform int64 get_tsc();
  248. diff --git a/tutorials/find_embree/find_embree.cpp b/tutorials/find_embree/find_embree.cpp
  249. index 473231281..d923ee579 100644
  250. --- a/tutorials/find_embree/find_embree.cpp
  251. +++ b/tutorials/find_embree/find_embree.cpp
  252. @@ -14,7 +14,7 @@
  253. // limitations under the License. //
  254. // ======================================================================== //
  255.  
  256. -#include <embree2/rtcore.h>
  257. +#include <embree2-bvh/rtcore.h>
  258.  
  259. #include <xmmintrin.h>
  260. //#include <pmmintrin.h> // use this to get _MM_SET_DENORMALS_ZERO_MODE when compiling for SSE3 or higher
  261. diff --git a/tutorials/find_embree/find_embree_ispc.cpp b/tutorials/find_embree/find_embree_ispc.cpp
  262. index ce3ca9cd3..eab3dd102 100644
  263. --- a/tutorials/find_embree/find_embree_ispc.cpp
  264. +++ b/tutorials/find_embree/find_embree_ispc.cpp
  265. @@ -14,7 +14,7 @@
  266. // limitations under the License. //
  267. // ======================================================================== //
  268.  
  269. -#include <embree2/rtcore.h>
  270. +#include <embree2-bvh/rtcore.h>
  271.  
  272. #include <xmmintrin.h>
  273. //#include <pmmintrin.h> // use this to get _MM_SET_DENORMALS_ZERO_MODE when compiling for SSE3 or higher
  274. diff --git a/tutorials/find_embree/find_embree_ispc.ispc b/tutorials/find_embree/find_embree_ispc.ispc
  275. index 6928cc4dc..e72c2ecbf 100644
  276. --- a/tutorials/find_embree/find_embree_ispc.ispc
  277. +++ b/tutorials/find_embree/find_embree_ispc.ispc
  278. @@ -14,7 +14,7 @@
  279. // limitations under the License. //
  280. // ======================================================================== //
  281.  
  282. -#include <embree2/rtcore.isph>
  283. +#include <embree2-bvh/rtcore.isph>
  284.  
  285. export void ispcEntry()
  286. {
  287. diff --git a/kernels/xeon/CMakeLists.txt b/kernels/xeon/CMakeLists.txt
  288. index 5170d240f..c4d63570b 100644
  289. --- a/kernels/xeon/CMakeLists.txt
  290. +++ b/kernels/xeon/CMakeLists.txt
  291. @@ -248,9 +248,9 @@ ENDIF()
  292. TARGET_LINK_LIBRARIES(embree ${EMBREE_LIBRARIES} sys simd lexers)
  293.  
  294. IF (RTCORE_ZIP_MODE)
  295. - SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION_MAJOR} SOVERSION ${EMBREE_VERSION_MAJOR})
  296. + SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION_MAJOR}.${EMBREE_VERSION_MINOR} SOVERSION ${EMBREE_VERSION_MAJOR}.${EMBREE_VERSION_MINOR})
  297. ELSE()
  298. - SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION} SOVERSION ${EMBREE_VERSION_MAJOR})
  299. + SET_TARGET_PROPERTIES(embree PROPERTIES VERSION ${EMBREE_VERSION} SOVERSION ${EMBREE_VERSION_MAJOR}.${EMBREE_VERSION_MINOR})
  300. ENDIF()
  301.  
  302. IF (WIN32)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!