Skip to content

Commit d5cabfe

Browse files
committed
Add Calc and RadeonRays compilation
-No kernel cache for RR yet
1 parent 437c960 commit d5cabfe

File tree

6 files changed

+173
-1509
lines changed

6 files changed

+173
-1509
lines changed

CLW/CLWParallelPrimitives.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ THE SOFTWARE.
3030

3131
#ifdef RR_EMBED_KERNELS
3232
#if USE_OPENCL
33-
#include "CLW/kernelcache/clwkernels_cl.h"
33+
#include "clwkernels_cl.h"
3434
#endif
3535
#endif // RR_EMBED_KERNELS
3636

CLW/CMakeLists.txt

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@ set(SOURCES
1313
ParameterHolder.cpp
1414
ReferenceCounter.cpp)
1515

16+
set(SHADER CL/CLW.cl)
17+
1618
add_library(CLW STATIC ${SOURCES})
1719

1820
if (UNIX)
@@ -21,9 +23,25 @@ elseif (APPLE)
2123
target_compile_options(CLW PUBLIC -std=c++11 -stdlib=libc++)
2224
endif (UNIX)
2325

26+
27+
2428
if (RR_ALLOW_CPU_DEVICES)
25-
target_compile_definitions(CLW PUBLIC RR_ALLOW_CPU_DEVICES=1)
29+
target_compile_definitions(CLW PRIVATE RR_ALLOW_CPU_DEVICES=1)
2630
endif(RR_ALLOW_CPU_DEVICES)
2731

32+
#CLW always embed its kernels
33+
target_compile_definitions(CLW PRIVATE RR_EMBED_KERNELS=1)
34+
add_custom_command(
35+
OUTPUT ${CLW_BINARY_DIR}/clwkernels_cl.h
36+
COMMAND ${PYTHON_EXECUTABLE} ${STRINGIFY_SCRIPT} ${CLW_SOURCE_DIR}/CL/ .cl opencl > ${CLW_BINARY_DIR}/clwkernels_cl.h
37+
MAIN_DEPENDENCY ${SHADER}
38+
COMMENT "Generating CLW kernel cache"
39+
VERBATIM)
40+
target_include_directories(CLW PRIVATE ${CLW_BINARY_DIR})
41+
target_include_directories(CLW PUBLIC .)
42+
add_custom_target(clw_kernel_cache_h DEPENDS "${CLW_BINARY_DIR}/clwkernels_cl.h")
43+
44+
add_dependencies(CLW clw_kernel_cache_h)
45+
2846
target_link_libraries(CLW PUBLIC OpenCL::OpenCL)
2947

0 commit comments

Comments
 (0)