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:
authorStefan Werner <stefan.werner@tangent-animation.com>2018-07-06 11:21:02 +0300
committerStefan Werner <stefan.werner@tangent-animation.com>2018-07-06 11:21:25 +0300
commitd20d2bcb7fe76a5a8241eefb2f2f3374e4d101bd (patch)
tree279cf4eb02d598b6e2a34b8e55fa9dd6ee085c89
parent1daa20ad9f6f0c433a4e0a97a74e5beb9ea4e2c7 (diff)
Cycles: Fixed OpenCL kernel build, it threw a compiler error.
-rw-r--r--intern/cycles/kernel/filter/filter_defines.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/intern/cycles/kernel/filter/filter_defines.h b/intern/cycles/kernel/filter/filter_defines.h
index d48ea3ac1d6..1a2f22a6987 100644
--- a/intern/cycles/kernel/filter/filter_defines.h
+++ b/intern/cycles/kernel/filter/filter_defines.h
@@ -50,7 +50,15 @@ typedef struct TileInfo {
tile_buffer_1, tile_buffer_2, tile_buffer_3, \
tile_buffer_4, tile_buffer_5, tile_buffer_6, \
tile_buffer_7, tile_buffer_8, tile_buffer_9
-# define ccl_get_tile_buffer(id) (tile_buffer_ ## id)
+# define ccl_get_tile_buffer(id) (id == 0 ? tile_buffer_1 \
+ : id == 1 ? tile_buffer_2 \
+ : id == 2 ? tile_buffer_3 \
+ : id == 3 ? tile_buffer_4 \
+ : id == 4 ? tile_buffer_5 \
+ : id == 5 ? tile_buffer_6 \
+ : id == 6 ? tile_buffer_7 \
+ : id == 7 ? tile_buffer_8 \
+ : tile_buffer_9)
#else
# ifdef __KERNEL_CUDA__
# define CCL_FILTER_TILE_INFO ccl_global TileInfo* tile_info