diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-31 17:51:55 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-03-31 17:52:14 +0300 |
| commit | 79918e05773132ce1f96c90b555348229ddfcf73 (patch) | |
| tree | 5fab26281336976510832f36f30aeb9a6a73c3ed /intern/cycles/kernel/svm/svm.h | |
| parent | 7da4c2637d35c8f0f05de43a2bfbea7958dc6e44 (diff) | |
Cycles: Avoid float/int conversion in few places
Diffstat (limited to 'intern/cycles/kernel/svm/svm.h')
| -rw-r--r-- | intern/cycles/kernel/svm/svm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/intern/cycles/kernel/svm/svm.h b/intern/cycles/kernel/svm/svm.h index d59c9b9e61c..dd9173d92b3 100644 --- a/intern/cycles/kernel/svm/svm.h +++ b/intern/cycles/kernel/svm/svm.h @@ -87,7 +87,7 @@ ccl_device_inline int stack_load_int(float *stack, uint a) return __float_as_int(stack[a]); } -ccl_device_inline float stack_load_int_default(float *stack, uint a, uint value) +ccl_device_inline int stack_load_int_default(float *stack, uint a, uint value) { return (a == (uint)SVM_STACK_INVALID)? (int)value: stack_load_int(stack, a); } |