Merge branch 'erfan_fixes' into baw

Author: Erfan-Ahmadi

.gitignore

@@ -16,6 +16,7 @@
 # CEGUI's downloaded dependencies on Windows
 3rdparty/CEGUI/cegui-deps-0.8.x-src.zip
 # usually where people build
+android_build/*
 build*/*
 # default install paths
 install/*

.gitmodules

@@ -39,13 +39,6 @@
 [submodule "3rdparty/bullet3"]
 	path = 3rdparty/bullet3
 	url = https://github.com/bulletphysics/bullet3.git
-[submodule "examples_tests/media/cegui_alfisko"]
-	path = examples_tests/media/cegui_alfisko
-	url = https://gitlab.com/InnerPieceOSS/cegui_alfisko.git
-[submodule "3rdparty/CEGUI/cegui"]
-	path = 3rdparty/CEGUI/cegui
-	url = https://gitlab.com/InnerPieceOSS/cegui.git
-	branch = saga
 [submodule "ext/CEGUI/stb"]
 	path = ext/CEGUI/stb
 	url = https://github.com/nothings/stb.git
@@ -62,13 +55,6 @@
 [submodule "3rdparty/freetype2"]
 	path = 3rdparty/freetype2
 	url = https://git.sv.nongnu.org/r/freetype/freetype2.git
-[submodule "3rdparty/CEGUI/pcre"]
-	path = 3rdparty/CEGUI/pcre
-	url = https://github.com/svn2github/pcre.git
-[submodule "3rdparty/CEGUI/glew-cmake"]
-	path = 3rdparty/CEGUI/glew
-	url = https://github.com/AnastaZIuk/glew-cmake.git
-	branch = master
 [submodule "3rdparty/openexr"]
 	path = 3rdparty/openexr
 	url = https://github.com/AcademySoftwareFoundation/openexr.git
@@ -80,15 +66,11 @@
 	url = https://github.com/greg7mdp/parallel-hashmap
 [submodule "3rdparty/radeonrays"]
 	path = 3rdparty/radeonrays
-	url = https://github.com/devshgraphicsprogramming/RadeonRays_SDK.git
+	url = git@github.com:devshgraphicsprogramming/RadeonRays_SDK.git
 	branch = baw
 [submodule "3rdparty/jitify"]
 	path = 3rdparty/jitify
 	url = https://github.com/NVIDIA/jitify
-[submodule "3rdparty/SDL2"]
-	path = 3rdparty/SDL2
-	url = https://github.com/spurious/SDL-mirror.git
-	branch = release-2.0.12
 [submodule "3rdparty/volk"]
 	path = 3rdparty/volk
 	url = https://github.com/zeux/volk.git
@@ -104,3 +86,9 @@
 [submodule "3rdparty/nbl_spirv_cross"]
 	path = 3rdparty/nbl_spirv_cross
 	url = https://github.com/devshgraphicsprogramming/SPIRV-Cross.git
+[submodule "3rdparty/pstl/oneTBB"]
+	path = 3rdparty/pstl/oneTBB
+	url = https://github.com/Devsh-Graphics-Programming/oneTBB.git
+[submodule "3rdparty/pstl/oneDPL/oneDPL"]
+	path = 3rdparty/pstl/oneDPL/oneDPL
+	url = https://github.com/Devsh-Graphics-Programming/oneDPL.git

3rdparty/CEGUI/CMakeLists.txt

@@ -8,7 +8,6 @@ include(../cmake/common.cmake)
 option(NBL_UPDATE_GIT_SUBMODULE "" ON)
 
 if(NBL_UPDATE_GIT_SUBMODULE)
-	update_git_submodule(./SDL2)
 	update_git_submodule(./volk)
 	update_git_submodule(./SPIRV-Headers)
 	update_git_submodule(./SPIRV-Tools)
@@ -32,6 +31,8 @@ if(NBL_UPDATE_GIT_SUBMODULE)
 	update_git_submodule(./portable-file-dialogs)
 	update_git_submodule(./simdjson)
 	update_git_submodule(./glTFSampleModels)
+	update_git_submodule(./pstl/oneTBB)
+	update_git_submodule(./pstl/oneDPL/oneDPL)
 endif()
 
 # simdjson
@@ -63,6 +64,10 @@ if(DEFINED ENV{VULKAN_SDK})
     target_include_directories(volk_headers INTERFACE "$ENV{VULKAN_SDK}/include")
 endif()
 
+if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
+	add_subdirectory(pstl pstl)
+endif()
+
 # SDL2
 if (NBL_COMPILE_WITH_SDL2)
 	set(SDL_STATIC_ENABLED_BY_DEFAULT ON)
@@ -503,7 +508,8 @@ if (NBL_BUILD_RADEON_RAYS)
 	option(RR_NO_TESTS "RADEON_RAYS: don't do tests" ON)
 	option(RR_ENABLE_STATIC "RADEON_RAYS: compile into a static library" ON)
 	option(RR_EMBED_KERNELS "RADEON_RAYS: so we don't have to go looking for OpenCL kernel code" ON)
-	option(RR_USE_VULKAN "RADEON_RAYS: use Vulkan (only if you have RR 3.0)" OFF)
+	set(RR_USE_VULKAN OFF CACHE BOOL "RADEON_RAYS: Cannot use Vulkan for RR 2.0 the backend is broken" FORCE)
+	set(RR_ENABLE_BACKFACE_CULL OFF CACHE BOOL "RADEON_RAYS: Don't enable backface culling (we use the memory of the ray struct for something else there)." FORCE)
 	set(MSVC_USE_STATIC_CRT ON CACHE BOOL "Use /MT flag (static CRT) when compiling in MSVC")
 	add_subdirectory(radeonrays EXCLUDE_FROM_ALL)