diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-12 01:58:48 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-12 01:58:48 +0400 |
| commit | 37f92119e449a56116bc7a78aaafeaa67ee4c493 (patch) | |
| tree | 1075e1fde2056b7cf66c6b94593a847393d5174a /intern/cycles/kernel/kernel_jitter.h | |
| parent | 3d21bf96887cf0f936d9f280516c94a814b9fbf2 (diff) | |
Fix #35665: more CUDA issues with recent kernel changes, tested on sm_20, sm_21
and sm_30 cards, so hopefully it should all work now.
Also includes some warnings fixes related to nvcc compiler arguments, should make
no difference otherwise.
Diffstat (limited to 'intern/cycles/kernel/kernel_jitter.h')
| -rw-r--r-- | intern/cycles/kernel/kernel_jitter.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/intern/cycles/kernel/kernel_jitter.h b/intern/cycles/kernel/kernel_jitter.h index 5ea44cd0cad..15d2151228f 100644 --- a/intern/cycles/kernel/kernel_jitter.h +++ b/intern/cycles/kernel/kernel_jitter.h @@ -146,7 +146,7 @@ __device_noinline float cmj_sample_1D(int s, int N, int p) return (x + jx)*invN; } -__device_noinline float2 cmj_sample_2D(int s, int N, int p) +__device_noinline void cmj_sample_2D(int s, int N, int p, float *fx, float *fy) { int m = float_to_int(sqrtf(N)); int n = (N + m - 1)/m; @@ -173,7 +173,8 @@ __device_noinline float2 cmj_sample_2D(int s, int N, int p) float jx = cmj_randfloat(s, p * 0x967a889b); float jy = cmj_randfloat(s, p * 0x368cc8b7); - return make_float2((sx + (sy + jx)*invn)*invm, (s + jy)*invN); + *fx = (sx + (sy + jx)*invn)*invm; + *fy = (s + jy)*invN; } #endif |