Updated Embree (OSX/Win) to 2.7, TBB (OSX/Win) to 4.4

Author: betajippity

README.md

@@ -1,7 +1,7 @@
 Nuparu
 ======
 
-v0.1.15.35
+v0.1.15.39
 
 Third Party dependencies and foundation libraries for Karl's graphics projects
 
@@ -18,10 +18,10 @@ Nuparu currently consists of:
 * [Partio](http://www.disneyanimation.com/technology/partio.html) 1.1.0 (OSX/Win)
 * [RMSD](http://boscoh.com/code/) (OSX/Linux/Win)
 * [OpenEXR](http://www.openexr.com) 2.1.0 (OSX/Win)
-* [TBB](https://www.threadingbuildingblocks.org/) 4.3 Update 4 (OSX/Win)
+* [TBB](https://www.threadingbuildingblocks.org/) 4.4 (OSX/Win)
 * [Zlib](http://www.zlib.net/) 1.2.8 (Win)
 * [Boost](www.boost.org) 1.55.0 (OSX/Linux/Win)
-* [Embree](https://embree.github.io) 2.4 (OSX/Win)
+* [Embree](https://embree.github.io) 2.7 (OSX/Win)
 
 Notes:
 

include/embree2/config.h

@@ -1,5 +1,5 @@
 // ======================================================================== //
-// Copyright 2009-2014 Intel Corporation                                    //
+// Copyright 2009-2015 Intel Corporation                                    //
 //                                                                          //
 // Licensed under the Apache License, Version 2.0 (the "License");          //
 // you may not use this file except in compliance with the License.         //
@@ -18,11 +18,18 @@
 #define __RTCORE_H__
 
 #include <stddef.h>
-// read configuration generated by CMake
-#include "config.h"
+#include <sys/types.h>
+
+#if defined(_WIN32)
+#if defined(_M_X64)
+typedef long long ssize_t;
+#else
+typedef int ssize_t;
+#endif
+#endif
 
 #ifndef RTCORE_API
-#if defined(_WIN32) && defined(BUILD_EMBREE_SHARED_LIB)
+#if defined(_WIN32) && !defined(ENABLE_STATIC_LIB)
 #  define RTCORE_API extern "C" __declspec(dllimport) 
 #else
 #  define RTCORE_API extern "C"
@@ -35,9 +42,19 @@
 #  define RTCORE_ALIGN(...) __attribute__((aligned(__VA_ARGS__)))
 #endif
 
-#include "rtcore_scene.h"
-#include "rtcore_geometry.h"
-#include "rtcore_geometry_user.h"
+#ifdef __GNUC__
+  #define RTCORE_DEPRECATED __attribute__((deprecated))
+#elif defined(_MSC_VER)
+  #define RTCORE_DEPRECATED __declspec(deprecated)
+#else
+  #define RTCORE_DEPRECATED
+#endif
+
+/*! Embree API version */
+#define RTCORE_VERSION_MAJOR @EMBREE_VERSION_MAJOR@
+#define RTCORE_VERSION_MINOR @EMBREE_VERSION_MINOR@
+#define RTCORE_VERSION_PATCH @EMBREE_VERSION_PATCH@
+#define RTCORE_VERSION       @EMBREE_VERSION_NUMBER@
 
 /*! \file rtcore.h Defines the Embree Ray Tracing Kernel API for C and C++ 
 
@@ -48,31 +65,80 @@
 
 /*! \{ */
 
+/*! \brief Defines an opaque device type */
+typedef struct __RTCDevice {}* RTCDevice;
+
+/*! \brief Creates a new Embree device.
+
+  Creates a new Embree device to be used by the application. An
+  application typically creates only a single Embree device, but it is
+  valid to use multiple devices inside an application. A configuration
+  string can be passed at construction time, that allows to configure
+  implementation specific parameters. If this string is NULL, a
+  default configuration is used. The following configuration flags are
+  supported by the Embree implementation of the API:
+  
+  verbose = num,       // sets verbosity level (default is 0)
+
+  If Embree is started on an unsupported CPU, rtcNewDevice will fail and
+  set the RTC_UNSUPPORTED_CPU error code.
+  
+*/
+RTCORE_API RTCDevice rtcNewDevice(const char* cfg = NULL);
+
+/*! \brief Deletes an Embree device.
+
+  Deletes the Embree device again. After deletion, all scene handles
+  are invalid. The application should invoke this call before
+  terminating. */
+RTCORE_API void rtcDeleteDevice(RTCDevice device);
+
 /*! \brief Initializes the Embree ray tracing core
 
+  WARNING: This function is deprecated, use rtcNewDevice instead.
+
   Initializes the ray tracing core and passed some configuration
   string. The configuration string allows to configure implementation
   specific parameters. If this string is NULL, a default configuration
   is used. The following configuration flags are supported by the
   Embree implementation of the API:
   
-  threads = num,       // sets the number of threads to use (default is to use all threads)
   verbose = num,       // sets verbosity level (default is 0)
 
   If Embree is started on an unsupported CPU, rtcInit will fail and
   set the RTC_UNSUPPORTED_CPU error code.
   
 */
-RTCORE_API void rtcInit(const char* cfg = NULL);
+RTCORE_API RTCORE_DEPRECATED void rtcInit(const char* cfg = NULL);
 
-/*! \brief Shuts down Embree. 
+/*! \brief Shuts down Embree
+
+  WARNING: This function is deprecated, use rtcDeleteDevice instead.
 
   Shuts down the ray tracing core. After shutdown, all scene handles
   are invalid, and invoking any API call except rtcInit is not
   allowed. The application should invoke this call before
   terminating. It is safe to call rtcInit again after an rtcExit
   call. */
-RTCORE_API void rtcExit();
+RTCORE_API RTCORE_DEPRECATED void rtcExit();
+
+/*! \brief Parameters that can get configured using the rtcSetParameter functions. */
+enum RTCParameter {
+  RTC_SOFTWARE_CACHE_SIZE = 0      /*! Configures the software cache size (used
+                                     to cache subdivision surfaces for
+                                     instance). The size is specified as an
+                                     integer number of bytes. The software
+                                     cache cannot be configured during
+                                     rendering. */
+};
+
+/*! \brief Configures some parameters. 
+    WARNING: This function is deprecated, use rtcDeviceSetParameter1i instead.
+*/
+RTCORE_API RTCORE_DEPRECATED void rtcSetParameter1i(const RTCParameter parm, ssize_t val);
+
+/*! \brief Configures some device parameters. */
+RTCORE_API void rtcDeviceSetParameter1i(RTCDevice device, const RTCParameter parm, ssize_t val);
 
 /*! \brief Error codes returned by the rtcGetError function. */
 enum RTCError {
@@ -82,26 +148,60 @@ enum RTCError {
   RTC_INVALID_OPERATION = 3, //!< The operation is not allowed for the specified object.
   RTC_OUT_OF_MEMORY = 4,     //!< There is not enough memory left to execute the command.
   RTC_UNSUPPORTED_CPU = 5,   //!< The CPU is not supported as it does not support SSE2.
+  RTC_CANCELLED = 6,         //!< The user has cancelled the operation through the RTC_PROGRESS_MONITOR_FUNCTION callback
 };
 
 /*! \brief Returns the value of the per-thread error flag. 
 
+  WARNING: This function is deprecated, use rtcDeviceGetError instead.
+
   If an error occurs this flag is set to an error code if it stores no
   previous error. The rtcGetError function reads and returns the
   currently stored error and clears the error flag again. */
-RTCORE_API RTCError rtcGetError();
+RTCORE_API RTCORE_DEPRECATED RTCError rtcGetError();
+
+/*! \brief Returns the value of the per-thread error flag. 
+
+  If an error occurs this flag is set to an error code if it stores no
+  previous error. The rtcGetError function reads and returns the
+  currently stored error and clears the error flag again. */
+RTCORE_API RTCError rtcDeviceGetError(RTCDevice device);
 
 /*! \brief Type of error callback function. */
-typedef void (*RTC_ERROR_FUNCTION)(const RTCError code, const char* str);
+typedef void (*RTCErrorFunc)(const RTCError code, const char* str);
+RTCORE_DEPRECATED typedef RTCErrorFunc RTC_ERROR_FUNCTION;
+
+/*! \brief Sets a callback function that is called whenever an error occurs. 
+   WARNING: This function is deprecated, use rtcDeviceSetErrorFunction instead.
+   */
+RTCORE_API RTCORE_DEPRECATED void rtcSetErrorFunction(RTCErrorFunc func);
 
 /*! \brief Sets a callback function that is called whenever an error occurs. */
-RTCORE_API void rtcSetErrorFunction(RTC_ERROR_FUNCTION func);
+RTCORE_API void rtcDeviceSetErrorFunction(RTCDevice device, RTCErrorFunc func);
+
+/*! \brief Type of memory consumption callback function. */
+typedef bool (*RTCMemoryMonitorFunc)(const ssize_t bytes, const bool post);
+RTCORE_DEPRECATED typedef RTCMemoryMonitorFunc RTC_MEMORY_MONITOR_FUNCTION;
+
+/*! \brief Sets the memory consumption callback function which is
+ *  called before or after the library allocates or frees memory. 
+   WARNING: This function is deprecated, use rtcDeviceSetMemoryMonitorFunction instead.
+*/
+RTCORE_API RTCORE_DEPRECATED void rtcSetMemoryMonitorFunction(RTCMemoryMonitorFunc func);
+
+/*! \brief Sets the memory consumption callback function which is
+ *  called before or after the library allocates or frees memory. */
+RTCORE_API void rtcDeviceSetMemoryMonitorFunction(RTCDevice device, RTCMemoryMonitorFunc func);
 
 /*! \brief Implementation specific (do not call).
 
   This function is implementation specific and only for debugging
   purposes. Do not call it. */
-RTCORE_API void rtcDebug();
+RTCORE_API RTCORE_DEPRECATED void rtcDebug(); // FIXME: remove
+
+#include "rtcore_scene.h"
+#include "rtcore_geometry.h"
+#include "rtcore_geometry_user.h"
 
 /*! \brief Helper to easily combing scene flags */
 inline RTCSceneFlags operator|(const RTCSceneFlags a, const RTCSceneFlags b) {