diff options
| author | Stefan Werner <stefan.werner@tangent-animation.com> | 2018-03-08 00:19:56 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@gmail.com> | 2018-03-10 06:54:04 +0300 |
| commit | f66ff4ee86a9ead9ef6f3776b64f4dda32eab521 (patch) | |
| tree | 3412172b884acf0a5731aa734d8873bddef3d428 /intern/cycles/kernel/kernel_types.h | |
| parent | 41b38c5f75b371e3897685fd9a4cb953a4aa65ff (diff) | |
Code refactor: use KernelOject struct instead of float4 array.
Original patch by Stefan with modifications by Brecht.
Diffstat (limited to 'intern/cycles/kernel/kernel_types.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_types.h | 25 |
1 files changed, 24 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h index 2a437cdbdc6..b6f1a3a6d98 100644 --- a/intern/cycles/kernel/kernel_types.h +++ b/intern/cycles/kernel/kernel_types.h @@ -35,7 +35,6 @@ CCL_NAMESPACE_BEGIN /* Constants */ -#define OBJECT_SIZE 16 #define OBJECT_VECTOR_SIZE 6 #define LIGHT_SIZE 11 #define FILTER_TABLE_SIZE 1024 @@ -1434,6 +1433,30 @@ typedef struct KernelData { } KernelData; static_assert_align(KernelData, 16); +/* Kernel data structures. */ + +typedef struct KernelObject { + MotionTransform tfm; + + float surface_area; + float pass_id; + float random_number; + int particle_index; + + float dupli_generated[3]; + float dupli_uv[2]; + + int numkeys; + int numsteps; + int numverts; + + uint patch_map_offset; + uint attribute_map_offset; + uint pad1, pad2; +} KernelObject;; +static_assert_align(KernelObject, 16); + + /* Declarations required for split kernel */ /* Macro for queues */ |