diff options
| author | Brecht Van Lommel <brecht@blender.org> | 2022-06-17 18:16:37 +0300 |
|---|---|---|
| committer | Brecht Van Lommel <brecht@blender.org> | 2022-06-20 13:30:48 +0300 |
| commit | ff1883307f12a8b734bfcf87b01743dc73afae75 (patch) | |
| tree | 95fbecc1e681e89f6a5d030cb5f5f96879dc7fa7 /intern/cycles/kernel/camera | |
| parent | b73a52302edcd99f086fc26fc62a8ed4db29d562 (diff) | |
Cleanup: renaming and consistency for kernel data
* Rename "texture" to "data array". This has not used textures for a long time,
there are just global memory arrays now. (On old CUDA GPUs there was a cache
for textures but not global memory, so we used to put all data in textures.)
* For CUDA and HIP, put globals in KernelParams struct like other devices.
* Drop __ prefix for data array names, no possibility for naming conflict now that
these are in a struct.
Diffstat (limited to 'intern/cycles/kernel/camera')
| -rw-r--r-- | intern/cycles/kernel/camera/camera.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/intern/cycles/kernel/camera/camera.h b/intern/cycles/kernel/camera/camera.h index aad68e527ac..25960a94ddb 100644 --- a/intern/cycles/kernel/camera/camera.h +++ b/intern/cycles/kernel/camera/camera.h @@ -90,7 +90,7 @@ ccl_device void camera_sample_perspective(KernelGlobals kg, #ifdef __CAMERA_MOTION__ if (kernel_data.cam.num_motion_steps) { transform_motion_array_interpolate(&cameratoworld, - kernel_tex_array(__camera_motion), + kernel_data_array(camera_motion), kernel_data.cam.num_motion_steps, ray->time); } @@ -210,7 +210,7 @@ ccl_device void camera_sample_orthographic(KernelGlobals kg, #ifdef __CAMERA_MOTION__ if (kernel_data.cam.num_motion_steps) { transform_motion_array_interpolate(&cameratoworld, - kernel_tex_array(__camera_motion), + kernel_data_array(camera_motion), kernel_data.cam.num_motion_steps, ray->time); } @@ -421,7 +421,7 @@ ccl_device_inline void camera_sample(KernelGlobals kg, } else { #ifdef __CAMERA_MOTION__ - ccl_global const DecomposedTransform *cam_motion = kernel_tex_array(__camera_motion); + ccl_global const DecomposedTransform *cam_motion = kernel_data_array(camera_motion); camera_sample_panorama(&kernel_data.cam, cam_motion, raster_x, raster_y, lens_u, lens_v, ray); #else camera_sample_panorama(&kernel_data.cam, raster_x, raster_y, lens_u, lens_v, ray); |