diff options
| author | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-07 15:06:45 +0400 |
|---|---|---|
| committer | Lukas Toenne <lukas.toenne@googlemail.com> | 2012-09-07 15:06:45 +0400 |
| commit | a9105a7deaccbd98c4e994d8f0f041bef4179bfa (patch) | |
| tree | fc7fcebc23cdd2f580b32c7c629198497c6531ef /intern/cycles/util/util_types.h | |
| parent | 8b6046cdad1325a82e0d161fdca0118e62f36b2d (diff) | |
Fix for Cycles (CUDA) compilation (again ...). Moved the AttributeStandard enum typedef and the attribute_standard_name mapping function to util_attribute/util_types headers, so they can properly be used by kernel and render files alike. This should avoid any std C includes which are not available in CUDA. Thanks to Sergey for help!
Diffstat (limited to 'intern/cycles/util/util_types.h')
| -rw-r--r-- | intern/cycles/util/util_types.h | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/intern/cycles/util/util_types.h b/intern/cycles/util/util_types.h index 0451d877c45..5c6b9d5bb78 100644 --- a/intern/cycles/util/util_types.h +++ b/intern/cycles/util/util_types.h @@ -444,6 +444,22 @@ __device_inline int4 make_int4(const float3& f) #endif +typedef enum AttributeStandard { + ATTR_STD_NONE = 0, + ATTR_STD_VERTEX_NORMAL, + ATTR_STD_FACE_NORMAL, + ATTR_STD_UV, + ATTR_STD_GENERATED, + ATTR_STD_POSITION_UNDEFORMED, + ATTR_STD_POSITION_UNDISPLACED, + ATTR_STD_MOTION_PRE, + ATTR_STD_MOTION_POST, + ATTR_STD_PARTICLE, + ATTR_STD_NUM, + + ATTR_STD_NOT_FOUND = ~0 +} AttributeStandard; + CCL_NAMESPACE_END #endif /* __UTIL_TYPES_H__ */ |