Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-09 18:38:04 +0300
committerBrecht Van Lommel <brechtvanlommel@gmail.com>2019-01-09 18:42:03 +0300
commitb7fb3296c101bf408455352ec9784a8870672c81 (patch)
tree2e85e7b1b5e14be10eba9c11703d7cc7d9f2d407 /intern/cycles/device/device_split_kernel.h
parent1a6a80270dae82d5ce9bf1266476f7bf0fe1d714 (diff)
Fix T60300, T57774: Cycles OpenCL viewport crash with subsurface scattering.
Diffstat (limited to 'intern/cycles/device/device_split_kernel.h')
-rw-r--r--intern/cycles/device/device_split_kernel.h7
1 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/device/device_split_kernel.h b/intern/cycles/device/device_split_kernel.h
index 5af4367d1b6..622733b843f 100644
--- a/intern/cycles/device/device_split_kernel.h
+++ b/intern/cycles/device/device_split_kernel.h
@@ -92,10 +92,9 @@ private:
/* Work pool with respect to each work group. */
device_only_memory<unsigned int> work_pool_wgs;
- /* Marked True in constructor and marked false at the end of path_trace(). */
- bool first_tile;
-
- /* Cached global size */
+ /* Cached kernel-dependent data, initialized once. */
+ bool kernel_data_initialized;
+ size_t local_size[2];
size_t global_size[2];
public: