Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-05 01:48:32 +0400
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2014-02-05 01:50:11 +0400
commit502f9312d8c797d93d6084e17216013da8cc956a (patch)
treec9a5594eec3ee2ce471d59df7f442abc97565000 /intern/cycles/kernel/osl
parentbd438de8c6bee75c6ae7946a01a1b86e5cb05565 (diff)
Attempt to fix OSL build error on Linux with latest OSL master.
Diffstat (limited to 'intern/cycles/kernel/osl')
-rw-r--r--intern/cycles/kernel/osl/osl_services.cpp11
-rw-r--r--intern/cycles/kernel/osl/osl_services.h10
2 files changed, 18 insertions, 3 deletions
diff --git a/intern/cycles/kernel/osl/osl_services.cpp b/intern/cycles/kernel/osl/osl_services.cpp
index 9b2065d8892..4fad66be6e1 100644
--- a/intern/cycles/kernel/osl/osl_services.cpp
+++ b/intern/cycles/kernel/osl/osl_services.cpp
@@ -947,12 +947,21 @@ int OSLRenderServices::pointcloud_search(OSL::ShaderGlobals *sg, ustring filenam
return 0;
}
-int OSLRenderServices::pointcloud_get(ustring filename, size_t *indices, int count,
+int OSLRenderServices::pointcloud_get(OSL::ShaderGlobals *sg, ustring filename, size_t *indices, int count,
ustring attr_name, TypeDesc attr_type, void *out_data)
{
return 0;
}
+bool OSLRenderServices::pointcloud_write(OSL::ShaderGlobals *sg,
+ ustring filename, const OSL::Vec3 &pos,
+ int nattribs, const ustring *names,
+ const TypeDesc *types,
+ const void **data)
+{
+ return false;
+}
+
bool OSLRenderServices::trace(TraceOpt &options, OSL::ShaderGlobals *sg,
const OSL::Vec3 &P, const OSL::Vec3 &dPdx,
const OSL::Vec3 &dPdy, const OSL::Vec3 &R,
diff --git a/intern/cycles/kernel/osl/osl_services.h b/intern/cycles/kernel/osl/osl_services.h
index 21609621b1d..479b6da1afb 100644
--- a/intern/cycles/kernel/osl/osl_services.h
+++ b/intern/cycles/kernel/osl/osl_services.h
@@ -75,8 +75,14 @@ public:
float radius, int max_points, bool sort, size_t *out_indices,
float *out_distances, int derivs_offset);
- int pointcloud_get(ustring filename, size_t *indices, int count, ustring attr_name,
- TypeDesc attr_type, void *out_data);
+ int pointcloud_get(OSL::ShaderGlobals *sg, ustring filename, size_t *indices, int count,
+ ustring attr_name, TypeDesc attr_type, void *out_data);
+
+ bool pointcloud_write(OSL::ShaderGlobals *sg,
+ ustring filename, const OSL::Vec3 &pos,
+ int nattribs, const ustring *names,
+ const TypeDesc *types,
+ const void **data);
bool trace(TraceOpt &options, OSL::ShaderGlobals *sg,
const OSL::Vec3 &P, const OSL::Vec3 &dPdx,