[Bf-blender-cvs] [f6abc96] master: Cleanup: Remove OpenCL __MULTI_CLOSURE__ sanity check, not needed anymore after 04a10907dc41.
Thomas Dinges
noreply at git.blender.org
Mon Apr 21 18:08:15 CEST 2014
Commit: f6abc96b6b3ee53e100263e93de2e4323cd7231e
Author: Thomas Dinges
Date: Mon Apr 21 18:07:43 2014 +0200
https://developer.blender.org/rBf6abc96b6b3ee53e100263e93de2e4323cd7231e
Cleanup: Remove OpenCL __MULTI_CLOSURE__ sanity check, not needed anymore after 04a10907dc41.
===================================================================
M intern/cycles/device/device_opencl.cpp
M intern/cycles/kernel/kernel_types.h
===================================================================
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index 16958f8..9a5b261 100644
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -101,9 +101,6 @@ static string opencl_kernel_build_options(const string& platform, const string *
if(opencl_kernel_use_debug())
build_options += "-D__KERNEL_OPENCL_DEBUG__ ";
-
- if(opencl_kernel_use_advanced_shading(platform))
- build_options += "-D__KERNEL_OPENCL_NEED_ADVANCED_SHADING__ ";
return build_options;
}
diff --git a/intern/cycles/kernel/kernel_types.h b/intern/cycles/kernel/kernel_types.h
index 42d6ae6..93e8bf1 100644
--- a/intern/cycles/kernel/kernel_types.h
+++ b/intern/cycles/kernel/kernel_types.h
@@ -151,12 +151,6 @@ CCL_NAMESPACE_BEGIN
#define __HAIR__
#endif
-/* Sanity check */
-
-#if defined(__KERNEL_OPENCL_NEED_ADVANCED_SHADING__) && !defined(__MULTI_CLOSURE__)
-#error "OpenCL: mismatch between advanced shading flags in device_opencl.cpp and kernel_types.h"
-#endif
-
/* Random Numbers */
typedef uint RNG;
More information about the Bf-blender-cvs
mailing list