[Bf-blender-cvs] [d9e9bee140] temp-cycles-denoising: Cycles Denoising: Use kernel_config.h for CUDA as in the regular kernel

[Lukas Stockner]

Commit: d9e9bee1406af3b308397d282ee909f2d510d103
Author: Lukas Stockner
Date:   Thu Mar 23 17:31:00 2017 +0100
Branches: temp-cycles-denoising
https://developer.blender.org/rBd9e9bee1406af3b308397d282ee909f2d510d103

Cycles Denoising: Use kernel_config.h for CUDA as in the regular kernel

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

M	intern/cycles/filter/CMakeLists.txt
M	intern/cycles/filter/kernels/cuda/filter.cu
R095	intern/cycles/util/util_cuda_capabilities.h	intern/cycles/filter/kernels/cuda/kernel_config.h
M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/kernels/cuda/kernel.cu
M	intern/cycles/util/CMakeLists.txt

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

diff --git a/intern/cycles/filter/CMakeLists.txt b/intern/cycles/filter/CMakeLists.txt
index a5d7e29c74..1c12188768 100644
--- a/intern/cycles/filter/CMakeLists.txt
+++ b/intern/cycles/filter/CMakeLists.txt
@@ -42,9 +42,12 @@ set(SRC_KERNELS_CPU_HEADERS
 	kernels/cpu/filter_cpu_impl.h
 )
 
+set(SRC_KERNELS_CUDA_HEADERS
+	kernels/cuda/kernel_config.h
+)
+
 set(SRC_UTIL_HEADERS
 	../util/util_atomic.h
-	../util/util_cuda_capabilities.h
 	../util/util_color.h
 	../util/util_half.h
 	../util/util_hash.h
@@ -85,6 +88,7 @@ if(WITH_CYCLES_CUDA_BINARIES)
 	set(cuda_sources kernels/cuda/filter.cu
 		${SRC_HEADERS}
 		${SRC_UTIL_HEADERS}
+		${SRC_KERNELS_CUDA_HEADERS}
 	)
 	set(cuda_cubins)
 
@@ -158,6 +162,7 @@ add_library(cycles_filter
 	${SRC}
 	${SRC_HEADERS}
 	${SRC_KERNELS_CPU_HEADERS}
+	${SRC_KERNELS_CUDA_HEADERS}
 )
 
 if(WITH_CYCLES_CUDA)
diff --git a/intern/cycles/filter/kernels/cuda/filter.cu b/intern/cycles/filter/kernels/cuda/filter.cu
index 10abd7d314..a60c23ef9b 100644
--- a/intern/cycles/filter/kernels/cuda/filter.cu
+++ b/intern/cycles/filter/kernels/cuda/filter.cu
@@ -18,7 +18,7 @@
 
 #ifdef __CUDA_ARCH__
 
-#include "util_cuda_capabilities.h"
+#include "kernel_config.h"
 
 #include "../../filter_compat_cuda.h"
 
diff --git a/intern/cycles/util/util_cuda_capabilities.h b/intern/cycles/filter/kernels/cuda/kernel_config.h
similarity index 95%
rename from intern/cycles/util/util_cuda_capabilities.h
rename to intern/cycles/filter/kernels/cuda/kernel_config.h
index 7989d09c54..9fa39dc9eb 100644
--- a/intern/cycles/util/util_cuda_capabilities.h
+++ b/intern/cycles/filter/kernels/cuda/kernel_config.h
@@ -1,5 +1,5 @@
 /*
- * Copyright 2011-2017 Blender Foundation
+ * Copyright 2011-2013 Blender Foundation
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,9 +14,6 @@
  * limitations under the License.
  */
 
-#ifndef __UTIL_CUDA_CAPABILITIES_H__
-#define __UTIL_CUDA_CAPABILITIES_H__
-
 /* device data taken from CUDA occupancy calculator */
 
 /* 2.0 and 2.1 */
@@ -84,8 +81,6 @@
 #  error "Unknown or unsupported CUDA architecture, can't determine launch bounds"
 #endif
 
-
-
 /* compute number of threads per block and minimum blocks per multiprocessor
  * given the maximum number of registers per thread */
 
@@ -113,4 +108,3 @@
 #  error "Maximum number of registers per thread exceeded"
 #endif
 
-#endif /* __UTIL_CUDA_CAPABILITIES_H__ */
\ No newline at end of file
diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 1d9f673001..7495f3e0a3 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -201,7 +201,6 @@ set(SRC_GEOM_HEADERS
 
 set(SRC_UTIL_HEADERS
 	../util/util_atomic.h
-	../util/util_cuda_capabilities.h
 	../util/util_color.h
 	../util/util_half.h
 	../util/util_hash.h
diff --git a/intern/cycles/kernel/kernels/cuda/kernel.cu b/intern/cycles/kernel/kernels/cuda/kernel.cu
index 9e34786ba0..52e541321e 100644
--- a/intern/cycles/kernel/kernels/cuda/kernel.cu
+++ b/intern/cycles/kernel/kernels/cuda/kernel.cu
@@ -18,8 +18,6 @@
 
 #ifdef __CUDA_ARCH__
 
-#include "util_cuda_capabilities.h"
-
 #include "../../kernel_compat_cuda.h"
 #include "kernel_config.h"
 #include "../../kernel_math.h"
diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index 14b5f770a9..fb78e4c343 100644
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -37,7 +37,6 @@ set(SRC_HEADERS
 	util_args.h
 	util_atomic.h
 	util_boundbox.h
-	util_cuda_capabilities.h
 	util_debug.h
 	util_guarded_allocator.cpp
 	util_foreach.h