diff options
| author | Thomas Dinges <blender@dingto.org> | 2013-08-28 18:36:47 +0400 |
|---|---|---|
| committer | Thomas Dinges <blender@dingto.org> | 2013-08-28 18:36:47 +0400 |
| commit | 7ba41a3c7cd674f2f8814960132c6fe64ded6262 (patch) | |
| tree | 69490aa133cc8c476e220699e5eff35372870e99 | |
| parent | d539bd46729b3cdb85483f34f4aa362f2b64195a (diff) | |
Cycles / OpenCL:
* Some fixes for OpenCL, was broken after recent changes.
| -rw-r--r-- | intern/cycles/kernel/kernel.cl | 2 | ||||
| -rw-r--r-- | intern/cycles/kernel/svm/svm_sky.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/kernel.cl b/intern/cycles/kernel/kernel.cl index 5291ce28ab5..dd8ffdd2b33 100644 --- a/intern/cycles/kernel/kernel.cl +++ b/intern/cycles/kernel/kernel.cl @@ -49,7 +49,7 @@ __kernel void kernel_ocl_path_trace( int y = sy + get_global_id(1); if(x < sx + sw && y < sy + sh) - kernel_path_trace_progressive(kg, buffer, rng_state, sample, x, y, offset, stride); + kernel_path_trace(kg, buffer, rng_state, sample, x, y, offset, stride); } __kernel void kernel_ocl_tonemap( diff --git a/intern/cycles/kernel/svm/svm_sky.h b/intern/cycles/kernel/svm/svm_sky.h index cb6e5def4bd..81b5f1a201f 100644 --- a/intern/cycles/kernel/svm/svm_sky.h +++ b/intern/cycles/kernel/svm/svm_sky.h @@ -28,7 +28,7 @@ __device float sky_angle_between(float thetav, float phiv, float theta, float ph * "A Practical Analytic Model for Daylight" * A. J. Preetham, Peter Shirley, Brian Smits */ -__device float sky_perez_function(__constant float *lam, float theta, float gamma) +__device float sky_perez_function(float *lam, float theta, float gamma) { float ctheta = cosf(theta); float cgamma = cosf(gamma); @@ -66,7 +66,7 @@ __device float3 sky_radiance_old(KernelGlobals *kg, float3 dir, * "An Analytic Model for Full Spectral Sky-Dome Radiance" * Lukas Hosek, Alexander Wilkie */ -__device float sky_radiance_internal(__constant float *configuration, float theta, float gamma) +__device float sky_radiance_internal(float *configuration, float theta, float gamma) { float ctheta = cosf(theta); float cgamma = cosf(gamma); |