[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [59604] trunk/blender/intern/cycles/kernel : Cycles / OpenCL:
Thomas Dinges
blender at dingto.org
Wed Aug 28 16:36:47 CEST 2013
Revision: 59604
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=59604
Author: dingto
Date: 2013-08-28 14:36:47 +0000 (Wed, 28 Aug 2013)
Log Message:
-----------
Cycles / OpenCL:
* Some fixes for OpenCL, was broken after recent changes.
Modified Paths:
--------------
trunk/blender/intern/cycles/kernel/kernel.cl
trunk/blender/intern/cycles/kernel/svm/svm_sky.h
Modified: trunk/blender/intern/cycles/kernel/kernel.cl
===================================================================
--- trunk/blender/intern/cycles/kernel/kernel.cl 2013-08-28 14:11:28 UTC (rev 59603)
+++ trunk/blender/intern/cycles/kernel/kernel.cl 2013-08-28 14:36:47 UTC (rev 59604)
@@ -49,7 +49,7 @@
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(
Modified: trunk/blender/intern/cycles/kernel/svm/svm_sky.h
===================================================================
--- trunk/blender/intern/cycles/kernel/svm/svm_sky.h 2013-08-28 14:11:28 UTC (rev 59603)
+++ trunk/blender/intern/cycles/kernel/svm/svm_sky.h 2013-08-28 14:36:47 UTC (rev 59604)
@@ -28,7 +28,7 @@
* "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 @@
* "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);
More information about the Bf-blender-cvs
mailing list