Fix windows build. Add kernel embedding

Author: DenisBirukov

CMakeLists.txt

@@ -11,8 +11,9 @@ option(RR_NO_TESTS "Don't add any unit tests and remove any test functionality f
 option(RR_ENABLE_STATIC "Create static libraries rather than dynamic" OFF)
 option(RR_SHARED_CALC "Link Calc(compute abstraction layer) dynamically" OFF)
 option(RR_ENABLE_RAYMASK "Enable ray masking in intersection kernels" OFF)
-option(RR_TUTORIALS "Add tutorials projects" OFF)
+#option(RR_TUTORIALS "Add tutorials projects" OFF)
 option(RR_SAFE_MATH "use safe math" OFF)
+mark_as_advanced(FORCE RR_USE_VULKAN)
 
 #global settings
 if (WIN32)
@@ -64,9 +65,4 @@ if (NOT RR_NO_TESTS)
     add_subdirectory(UnitTest)
 endif (NOT RR_NO_TESTS)
 
-if (RR_TUTORIALS)
-#    add_subdirectory(Tutorials)
-endif (RR_TUTORIALS)
-
-
 

Calc/CMakeLists.txt

@@ -9,7 +9,7 @@ if (RR_USE_OPENCL)
 elseif (RR_USE_VULKAN)
     list(APPEND SOURCES 
         src/calc_vkw.cpp
-        src/device_vkw.cpp)
+        src/device_vkw.cpp)      
 endif (RR_USE_OPENCL)
 
 if (RR_SHARED_CALC)
@@ -33,3 +33,11 @@ endif (UNIX)
 if (RR_USE_OPENCL)
     target_link_libraries(Calc PUBLIC CLW)
 endif (RR_USE_OPENCL)
+
+if (RR_USE_VULKAN)
+    #Need to add Anvil to include path
+    target_include_directories(Calc
+        PRIVATE ${RadeonRaysSDK_SOURCE_DIR}/Anvil/deps
+        PRIVATE ${RadeonRaysSDK_SOURCE_DIR}/Anvil/include)
+    target_link_libraries(Calc PUBLIC Vulkan::Vulkan)
+endif (RR_USE_VULKAN)

RadeonRays/CMakeLists.txt

@@ -122,6 +122,10 @@ set(SOURCES
     ${UTIL_SOURCES}
     ${WORLD_SOURCES})
 
+if (RR_EMBED_KERNELS)
+    add_subdirectory(src/kernels)
+endif (RR_EMBED_KERNELS)
+    
 #Declare RadeonRays library
 if (RR_ENABLE_STATIC)
     add_library(RadeonRays STATIC ${SOURCES})
@@ -131,6 +135,12 @@ else (NOT RR_ENABLE_STATIC)
     target_compile_definitions(RadeonRays PUBLIC RR_STATIC_LIBRARY=0)
 endif(RR_ENABLE_STATIC)
 
+if (RR_EMBED_KERNELS)
+    target_compile_definitions(RadeonRays PRIVATE RR_EMBED_KERNELS=1)
+    add_dependencies(RadeonRays RadeonRaysKernelCache)
+    target_include_directories(RadeonRays PRIVATE ${RadeonRays_BINARY_DIR})
+endif (RR_EMBED_KERNELS)
+
 #Configure RadeonRays build
 target_include_directories(RadeonRays PUBLIC include)
 target_include_directories(RadeonRays 
@@ -159,7 +169,13 @@ if (RR_USE_OPENCL)
 endif (RR_USE_OPENCL)
 
 if (RR_USE_VULKAN)
-    target_link_libraries(RadeonRays PUBLIC Vulkan::Vulkan Anvil Thread::Threads)
+    #Need to add Anvil to include path
+    
+    target_include_directories(RadeonRays
+        PRIVATE ${RadeonRaysSDK_SOURCE_DIR}/Anvil/deps
+        PRIVATE ${RadeonRaysSDK_SOURCE_DIR}/Anvil/include)
+    
+    target_link_libraries(RadeonRays PUBLIC Vulkan::Vulkan Anvil Threads::Threads)
 endif (RR_USE_VULKAN)
 
 if (UNIX)

RadeonRays/src/accelerator/hlbvh.cpp

@@ -36,7 +36,10 @@ THE SOFTWARE.
 
 #ifdef RR_EMBED_KERNELS
 #if USE_OPENCL
-#    include "RadeonRays/src/kernelcache/kernels_cl.h"
+#    include "kernels_cl.h"
+#endif
+#if USE_VULKAN
+#    include "kernels_vk.h"
 #endif
 #endif // RR_EMBED_KERNELS
 

RadeonRays/src/intersector/intersector.h

@@ -163,11 +163,11 @@ namespace RadeonRays
 
 #ifdef RR_EMBED_KERNELS
 #if USE_OPENCL
-#    include "RadeonRays/src/kernelcache/kernels_cl.h"
+#    include "kernels_cl.h"
 #endif
 
 #if USE_VULKAN
-#    include <RadeonRays/src/kernelcache/kernels_vk.h>
+#    include "kernels_vk.h"
 #endif
 #endif // RR_EMBED_KERNELS
 

RadeonRays/src/kernels/CL/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_custom_command(
+    OUTPUT ${RadeonRays_BINARY_DIR}/kernels_cl.h
+    COMMAND ${PYTHON_EXECUTABLE} ${STRINGIFY_SCRIPT} ${RadeonRays_SOURCE_DIR}/src/kernels/CL/ .cl opencl > ${RadeonRays_BINARY_DIR}/kernels_cl.h
+    MAIN_DEPENDENCY ${SHADER}
+    COMMENT "Generating RadeonRays OpenCL kernel cache"
+    VERBATIM)
+add_custom_target(RadeonRaysKernelCache DEPENDS "${RadeonRays_BINARY_DIR}/kernels_cl.h")
+

RadeonRays/src/kernels/CMakeLists.txt

@@ -0,0 +1,5 @@
+if (RR_USE_OPENCL)
+    add_subdirectory(CL)
+elseif (RR_USE_VULKAN)
+    add_subdirectory(GLSL)
+endif (RR_USE_OPENCL)

RadeonRays/src/kernels/GLSL/CMakeLists.txt

@@ -0,0 +1,8 @@
+add_custom_command(
+    OUTPUT ${RadeonRays_BINARY_DIR}/kernels_vk.h
+    COMMAND ${PYTHON_EXECUTABLE} ${STRINGIFY_SCRIPT} ${RadeonRays_SOURCE_DIR}/src/kernels/GLSL/ .comp vulkan > ${RadeonRays_BINARY_DIR}/kernels_vk.h
+    MAIN_DEPENDENCY ${SHADER}
+    COMMENT "Generating RadeonRays Vulkan kernel cache"
+    VERBATIM)
+add_custom_target(RadeonRaysKernelCache DEPENDS "${RadeonRays_BINARY_DIR}/kernels_vk.h")
+

Tutorials/CMakeLists.txt

@@ -0,0 +1,5 @@
+#add_subdirectory(Tools)
+#add_subdirectory(CornellBox)
+#add_subdirectory(CornellBoxShadow)
+#add_subdirectory(Triangle)
+#add_subdirectory(TriangleLight)

Tutorials/CornellBox/CMakeLists.txt

@@ -0,0 +1,19 @@
+project (TutorialCornellBox CXX)
+
+set(SOURCES main.cpp
+    $<TARGET_OBJECTS:TutorialTools>)
+    
+#message(FATAL_ERROR $<TARGET_OBJECTS:TutorialTools>)
+
+add_executable(TutorialCornellBox ${SOURCES})
+target_compile_features(TutorialCornellBox PRIVATE cxx_std_11)
+target_link_libraries(TutorialCornellBox PRIVATE RadeonRays)
+if (APPLE OR UNIX)
+    target_link_libraries(TutorialCornellBox PRIVATE OpenGL::GL GLUT::GLUT GLEW::GLEW ${OIIO_LIBS})
+elseif (WIN32)
+    target_include_directories(TutorialCornellBox 
+        PRIVATE ${GLUT_INCLUDES} 
+        PRIVATE ${GLEW_INCLUDES} 
+        PRIVATE ${OIIO_INCLUDES})
+    target_link_libraries(TutorialCornellBox PRIVATE OpenGL::GL ${GLUT_LIBS} ${GLEW_LIBS} ${OIIO_LIBS})
+endif (APPLE OR UNIX)