Commit: 502f9312d8c797d93d6084e17216013da8cc956a
Author: Brecht Van Lommel
Date: Tue Feb 4 22:48:32 2014 +0100
https://developer.blender.org/rB502f9312d8c797d93d6084e17216013da8cc956a
Attempt to fix OSL build error on Linux with latest OSL master.
===================================================================
M intern/cycles/kernel/osl/osl_services.cpp
M intern/cycles/kernel/osl/osl_services.h
===================================================================
diff --git a/intern/cycles/kernel/osl/osl_services.cpp
b/intern/cycles/kernel/osl/osl_services.cpp
index 9b2065d..4fad66b 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 2160962..479b6da 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,
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
