Modify submodule for Baikal build

Author: yozhijk

CLW/CLW.lua

@@ -1,7 +1,7 @@
 project "CLW"
     kind "StaticLib"
     location "../CLW"
-    includedirs { "." }
+    includedirs { ".", ".." }
     files { "../CLW/**.h", "../CLW/**.cpp", "../CLW/CL/CLW.cl" }
 
     if os.is("macosx") then
@@ -15,25 +15,22 @@ project "CLW"
     configuration {}
 
     -- we rely on RadeonRays to do the actual embedding for us
-    if _OPTIONS["embed_kernels"] then
-        defines {"RR_EMBED_KERNELS=1"}
-            os.execute( "python ../Tools/scripts/stringify.py " ..
+    defines {"RR_EMBED_KERNELS=1"}
+    os.execute( "python ../Tools/scripts/stringify.py " ..
                                 os.getcwd() .. "/../CLW/CL/ "  .. 
                                 ".cl " ..
                                 "opencl " ..
                                  "> ./kernelcache/clwkernels_cl.h"
                                 )
-            print ">> CLW: CL kernels embedded"
+    print ">> CLW: CL kernels embedded"
 
-        -- there is no CLW version for vulkan (yet at least)
-    end
 
     configuration {"x32", "Debug"}
-        targetdir "../Bin/Debug/x86"
+        targetdir "../../Bin/Debug/x86"
     configuration {"x64", "Debug"}
-        targetdir "../Bin/Debug/x64"
+        targetdir "../../Bin/Debug/x64"
     configuration {"x32", "Release"}
-        targetdir "../Bin/Release/x86"
+        targetdir "../../Bin/Release/x86"
     configuration {"x64", "Release"}
-        targetdir "../Bin/Release/x64"
+        targetdir "../../Bin/Release/x64"
     configuration {}

CLW/CLWParallelPrimitives.cpp

@@ -30,7 +30,7 @@ THE SOFTWARE.
 
 #ifdef RR_EMBED_KERNELS
 #if USE_OPENCL
-#    include <CLW/kernelcache/clwkernels_cl.h>
+#include <CLW/kernelcache/clwkernels_cl.h>
 #endif
 #endif // RR_EMBED_KERNELS
 

Calc/Calc.lua

@@ -30,16 +30,14 @@ project "Calc"
     includedirs { ".", "./inc", "../CLW" }
     files { "../Calc/**.h", "../Calc/**.cpp"}
 
-    if _OPTIONS["use_opencl"] then
 	links {"CLW"}
-    end
 
     configuration {"x32", "Debug"}
-        targetdir "../Bin/Debug/x86"
+        targetdir "../../Bin/Debug/x86"
     configuration {"x64", "Debug"}
-        targetdir "../Bin/Debug/x64"
+        targetdir "../../Bin/Debug/x64"
     configuration {"x32", "Release"}
-        targetdir "../Bin/Release/x86"
+        targetdir "../../Bin/Release/x86"
     configuration {"x64", "Release"}
-        targetdir "../Bin/Release/x64"
+        targetdir "../../Bin/Release/x64"
     configuration {}

RadeonRays/RadeonRays.lua

@@ -7,7 +7,7 @@ project "RadeonRays"
     end
 
     location "../RadeonRays"
-    includedirs { "./include", "../Calc/inc" }
+    includedirs { "./include", "../Calc/inc", ".." }
 
     if _OPTIONS["shared_calc"] then
         defines {"CALC_IMPORT_API"};
@@ -62,29 +62,15 @@ project "RadeonRays"
 
     configuration {}
 
-    if _OPTIONS["embed_kernels"] then
-        defines {"RR_EMBED_KERNELS=1"}
+    defines {"RR_EMBED_KERNELS=1"}
 
-        if _OPTIONS["use_vulkan"] then
-            os.execute( "python ../Tools/scripts/stringify.py " ..
-                                os.getcwd() .. "../RadeonRays/src/kernels/GLSL/ "  ..
-                                ".comp " ..
-                                "vulkan " ..
-                                 "> ./src/kernelcache/kernels_vk.h"
-                                )
-            print ">> RadeonRays: VK kernels embedded"
-        end
-
-        if _OPTIONS["use_opencl"] then
-            os.execute( "python ../Tools/scripts/stringify.py " ..
+    os.execute( "python ../Tools/scripts/stringify.py " ..
                                 os.getcwd() .. "/../RadeonRays/src/kernels/CL/ "  ..
                                 ".cl " ..
                                 "opencl " ..
                                  "> ./src/kernelcache/kernels_cl.h"
                                 )
-            print ">> RadeonRays: CL kernels embedded"
-        end
-    end
+    print ">> RadeonRays: CL kernels embedded"
 
     if _OPTIONS["use_embree"] then
         files {"../RadeonRays/src/device/embree*"}
@@ -109,40 +95,15 @@ project "RadeonRays"
 
     if _OPTIONS["enable_raymask"] then
        	configuration {}
-	defines {"RR_RAY_MASK"}
-    end
-
-    if _OPTIONS["use_vulkan"] then
-        local vulkanSDKPath = os.getenv( "VK_SDK_PATH" );
-        if vulkanSDKPath == nil then
-            vulkanSDKPath = os.getenv( "VULKAN_SDK" );
-        end
-        if vulkanSDKPath ~= nil then
-            configuration {"x32"}
-            libdirs { vulkanSDKPath .. "/Bin32" }
-            configuration {"x64"}
-            libdirs { vulkanSDKPath .. "/Bin" }
-            configuration {}
-        end
-        if os.is("macosx") then
-            --no Vulkan on macOs need to error out TODO
-        elseif os.is("linux") then
-            libdirs { vulkanSDKPath .. "/lib" }
-            links { "Anvil",
-                    "vulkan",
-                    "pthread"}
-        elseif os.is("windows") then
-            links {"Anvil"}
-            links {"vulkan-1"}
-        end
+		defines {"RR_RAY_MASK"}
     end
 
     configuration {"x32", "Debug"}
-        targetdir "../Bin/Debug/x86"
+        targetdir "../../Bin/Debug/x86"
     configuration {"x64", "Debug"}
-        targetdir "../Bin/Debug/x64"
+        targetdir "../../Bin/Debug/x64"
     configuration {"x32", "Release"}
-        targetdir "../Bin/Release/x86"
+        targetdir "../../Bin/Release/x86"
     configuration {"x64", "Release"}
-        targetdir "../Bin/Release/x64"
+        targetdir "../../Bin/Release/x64"
     configuration {}