sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles compiler fixes related to OSL changes:

Browse Source 
* reverted r50430
* removed 2 util_params.h includes from r50428, these were causing trouble with OIIO in CUDA compilation. The purpose of these was to define the ustring type, but can just use the standard string type from util_string as well.
This commit is contained in:
Lukas Toenne 2012-09-06 07:44:49 +00:00
parent afaa67b5b8
commit ab4b74f1ed
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/kernel/kernel_accumulate.h
View File

@ -301,7 +301,9 @@ __device_inline float3 path_radiance_sum(KernelGlobals *kg, PathRadiance *L)
__device_inline void path_radiance_clamp(PathRadiance *L, float3 *L_sum, float clamp)
{
#ifdef __OSL__
using std::isfinite;
#endif
float sum = fabsf((*L_sum).x) + fabsf((*L_sum).y) + fabsf((*L_sum).z);

2
intern/cycles/kernel/kernel_triangle.h
View File

@ -18,8 +18,6 @@
#include "kernel_projection.h"
#include "util_param.h"
CCL_NAMESPACE_BEGIN
/* Point on triangle for Moller-Trumbore triangles */

24
intern/cycles/kernel/kernel_types.h
View File

@ -22,7 +22,7 @@
#include "kernel_math.h"
#include "svm/svm_types.h"
#include "util_param.h"
#include "util_string.h"
#ifndef __KERNEL_GPU__
#define __KERNEL_CPU__
@ -370,28 +370,28 @@ typedef enum AttributeStandard {
ATTR_STD_NOT_FOUND = ~0
} AttributeStandard;
__device ustring attribute_standard_name(AttributeStandard std)
__device string attribute_standard_name(AttributeStandard std)
{
if(std == ATTR_STD_VERTEX_NORMAL)
return ustring("N");
return string("N");
else if(std == ATTR_STD_FACE_NORMAL)
return ustring("Ng");
return string("Ng");
else if(std == ATTR_STD_UV)
return ustring("uv");
return string("uv");
else if(std == ATTR_STD_GENERATED)
return ustring("generated");
return string("generated");
else if(std == ATTR_STD_POSITION_UNDEFORMED)
return ustring("undeformed");
return string("undeformed");
else if(std == ATTR_STD_POSITION_UNDISPLACED)
return ustring("undisplaced");
return string("undisplaced");
else if(std == ATTR_STD_MOTION_PRE)
return ustring("motion_pre");
return string("motion_pre");
else if(std == ATTR_STD_MOTION_POST)
return ustring("motion_post");
return string("motion_post");
else if(std == ATTR_STD_PARTICLE)
return ustring("particle");
return string("particle");
return ustring();
return string();
}
/* Closure data */