+merged with master

2013-12-18 11:37:01 +01:00
parent cdb50beaa2 d666fc3f8f
commit d77789d8fe
80 changed files with 257 additions and 162226 deletions
--- a/examples/tasksys.cpp
+++ b/examples/tasksys.cpp
@@ -184,7 +184,7 @@ struct TaskInfo {

 // ispc expects these functions to have C linkage / not be mangled
 extern "C" { 
-    void ISPCLaunch(void **handlePtr, void *f, void *data, int count);
+    void ISPCLaunch(void **handlePtr, void *f, void *data, int countx, int county, int countz);
    void *ISPCAlloc(void **handlePtr, int64_t size, int32_t alignment);
    void ISPCSync(void *handle);
 }