diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-09 14:44:21 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2017-08-09 15:08:58 +0300 |
| commit | 176ad9ecdd4efca4dbe33b9c3a003c16e3706433 (patch) | |
| tree | 129cc694eabcaaf5364932d0b2b202f8e3d4a0ca /intern/cycles/kernel/kernel_globals.h | |
| parent | 45d7513f84bd3f3ee52207d4373e2ff980c954aa (diff) | |
Cycles: Remove ulong usage
This is a bit confusing, especially when one mixes OpenCL code where ulong equals
to uint64_t with CPU side code where ulong is expected to be something else from
the naming.
This commit makes it so we use explicit name, common on all platforms.
Diffstat (limited to 'intern/cycles/kernel/kernel_globals.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_globals.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/kernel_globals.h b/intern/cycles/kernel/kernel_globals.h index c078f09e1d7..9d55183d94b 100644 --- a/intern/cycles/kernel/kernel_globals.h +++ b/intern/cycles/kernel/kernel_globals.h @@ -119,7 +119,7 @@ typedef type name##_t; typedef struct tex_info_t { uint buffer, padding; - ulong offset; + uint64_t offset; uint width, height, depth, options; } tex_info_t; |