From d20d2bcb7fe76a5a8241eefb2f2f3374e4d101bd Mon Sep 17 00:00:00 2001 From: Stefan Werner Date: Fri, 6 Jul 2018 10:21:02 +0200 Subject: Cycles: Fixed OpenCL kernel build, it threw a compiler error. --- intern/cycles/kernel/filter/filter_defines.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3