[Bf-blender-cvs] [0c720085929] master: fix msvc warnings about unknown opencl pragmas

lazydodo noreply at git.blender.org
Mon Mar 13 17:08:34 CET 2017


Commit: 0c7200859294511a3e29f52a4d15cedc932071c6
Author: lazydodo
Date:   Mon Mar 13 10:07:36 2017 -0600
Branches: master
https://developer.blender.org/rB0c7200859294511a3e29f52a4d15cedc932071c6

fix msvc warnings about unknown opencl pragmas

===================================================================

M	intern/cycles/kernel/kernel_queues.h

===================================================================

diff --git a/intern/cycles/kernel/kernel_queues.h b/intern/cycles/kernel/kernel_queues.h
index 2e63909a38c..96bc636d5ac 100644
--- a/intern/cycles/kernel/kernel_queues.h
+++ b/intern/cycles/kernel/kernel_queues.h
@@ -22,9 +22,10 @@ CCL_NAMESPACE_BEGIN
 /*
  * Queue utility functions for split kernel
  */
-
+#ifdef __KERNEL_OPENCL__
 #pragma OPENCL EXTENSION cl_khr_global_int32_base_atomics : enable
 #pragma OPENCL EXTENSION cl_khr_local_int32_base_atomics : enable
+#endif
 
 /*
  * Enqueue ray index into the queue




More information about the Bf-blender-cvs mailing list