Change the way external CMake projects work. That will fix some build issues

.travis.yml

@@ -10,8 +10,8 @@ compiler:
   - clang
 
 env:
-  - OPTIMIZE=ON TRACE=ON
-  - OPTIMIZE=OFF TRACE=OFF
+  - BUILD_TYPE=Debug EXTRA_CHECKS=ON TRACE=ON
+  - BUILD_TYPE=Release EXTRA_CHECKS=OFF TRACE=OFF
 
 cache:
   apt: true
@@ -32,7 +32,7 @@ before_install:
 script:
   - mkdir build 
   - cd build
-  - cmake .. -DANKI_OPTIMIZE=${OPTIMIZE} -DANKI_DEBUG=${OPTIMIZE} -DANKI_DEBUG_SYMBOLS=OFF -DANKI_BUILD_TOOLS=ON -DANKI_BUILD_TESTS=ON -DANKI_ENABLE_TRACE=${TRACE}
+  - cmake .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DANKI_EXTRA_CHECKS=${EXTRA_CHECKS} -DANKI_BUILD_TOOLS=ON -DANKI_BUILD_TESTS=ON -DANKI_ENABLE_TRACE=${TRACE}
   - make
 
 branches:

CMakeLists.txt

@@ -39,23 +39,11 @@ else()
 	set(GCC FALSE)
 endif()
 
-################################################################################
-# Some functions                                                               #
-################################################################################
-
-macro(defineStaticExternalLibrary extProj extLib extLibFname)
-	add_library(${extLib} STATIC IMPORTED GLOBAL)
-	set_target_properties(${extLib} PROPERTIES IMPORTED_LOCATION ${extLibFname})
-	add_dependencies(${extLib} ${extProj})
-endmacro()
-
 ################################################################################
 # Configuration                                                                #
 ################################################################################
 
-option(ANKI_OPTIMIZE "Optimize" ON)
-option(ANKI_DEBUG_SYMBOLS "Debug symbols" OFF)
-option(ANKI_DEBUG "Debugging checks" OFF)
+option(ANKI_EXTRA_CHECKS "Debugging checks (assertions)" OFF)
 option(ANKI_LTO "LTO compilation" OFF)
 
 option(ANKI_BUILD_TOOLS "Build tools" OFF)
@@ -77,12 +65,6 @@ set(ANKI_CPU_ADDR_SPACE "0" CACHE STRING "The CPU architecture (0 or 32 or 64).
 
 option(ANKI_ENABLE_SIMD "Enable or not SIMD optimizations" ON)
 
-if(ANKI_ENABLE_SIMD)
-	set(_ANKI_ENABLE_SIMD 1)
-else()
-	set(_ANKI_ENABLE_SIMD 0)
-endif()
-
 # Take a wild guess on the windowing system
 if(LINUX)
 	set(_WIN_BACKEND "SDL")
@@ -99,10 +81,6 @@ else()
 	message(FATAL_ERROR "Couldn't determine the window backend. You need to specify it manually")
 endif()
 
-# Extra directories
-set(ANKI_EXTRA_INCLUDE_DIRS CACHE STRING "Some extra include paths (Needed for some weird builds)")
-set(ANKI_EXTRA_LIB_DIRS CACHE STRING "Some extra lib paths (Needed for some weird builds)")
-
 # Valgrind
 option(ANKI_VALGRIND_HAPPY "Make valgrind happy" OFF)
 
@@ -127,20 +105,17 @@ set(LINKER_FLAGS "")
 # When building AnKi define this special flag
 set(COMPILER_FLAGS "${COMPILER_FLAGS} -DANKI_BUILD ")
 
-# address space
 if(NOT ANKI_CPU_ADDR_SPACE STREQUAL "0")
 	set(LINKER_FLAGS "${LINKER_FLAGS} -m${ANKI_CPU_ADDR_SPACE} ")
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -m${ANKI_CPU_ADDR_SPACE} ")
 endif()
 
-add_definitions(-fno-exceptions)
+set(COMPILER_FLAGS "${COMPILER_FLAGS} -fno-exceptions ")
 
-# static libstdc++
 if(GCC)
-	#set(CXX_FLAGS "${CXX_FLAGS} -static-libstdc++ ")
+	set(CXX_FLAGS "${CXX_FLAGS} -static-libstdc++ ")
 endif()
 
-# SSE
 if(ANKI_ENABLE_SIMD)
 	if(LINUX OR MACOS OR WINDOWS)
 		set(COMPILER_FLAGS "${COMPILER_FLAGS} -msse4 ")
@@ -149,58 +124,41 @@ if(ANKI_ENABLE_SIMD)
 	endif()
 endif()
 
-# Add debug
-if(ANKI_DEBUG_SYMBOLS)
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -g3 ")
-endif()
-
-if(ANKI_DEBUG)
-	if(GCC)
-		set(COMPILER_FLAGS "${COMPILER_FLAGS} -fstack-check ")
-	endif()
-else()
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -DNODEBUG ")
-	set(CXX_FLAGS "${CXX_FLAGS} -fno-rtti ")
-endif()
-
-# Add optimization flags
-if(ANKI_OPTIMIZE)
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -ffast-math -O3 ")
-
-	# Add this because Android compiler complains
-	if(ANDROID)
-		set(COMPILER_FLAGS "${COMPILER_FLAGS} -fno-data-sections ")
-	endif()
-else()
-	set(COMPILER_FLAGS "${COMPILER_FLAGS} -O0 ")
-endif()
-
-# LTO
 if(ANKI_LTO)
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -flto ")
 	set(LINKER_FLAGS "${LINKER_FLAGS} -flto ")
 endif()
 
-# Valgrind hacks
-if(ANKI_VALGRIND_HAPPY)
-	add_definitions("-DGLIBCXX_FORCE_NEW")
-endif()
-
-# Disable GLU in GLEW
-add_definitions(-DGLEW_NO_GLU)
-
-# Strip
 if(ANKI_STRIP)
 	set(LINKER_FLAGS "${LINKER_FLAGS} -s ")
 	set(COMPILER_FLAGS "${COMPILER_FLAGS} -s ")
 endif()
 
-include_directories(${ANKI_EXTRA_INCLUDE_DIRS})
-link_directories(${ANKI_EXTRA_LIB_DIRS})
+add_definitions(-DGLEW_NO_GLU)
+add_definitions(-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
+
+if(${CMAKE_BUILD_TYPE} STREQUAL "Release")
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -O3 -DNDEBUG ")
+
+	set(CMAKE_CXX_FLAGS_RELEASE "")
+	set(CMAKE_C_FLAGS_RELEASE "")
+elseif(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDbgInfo")
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -O3 -g3 ")
+
+	set(CMAKE_CXX_FLAGS_RELWITHDBGINFO "")
+	set(CMAKE_C_FLAGS_RELWITHDBGINFO "")
+elseif(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+	set(COMPILER_FLAGS "${COMPILER_FLAGS} -O0 -g3 ")
+
+	set(CMAKE_CXX_FLAGS_DEBUG "")
+	set(CMAKE_C_FLAGS_DEBUG "")
+else()
+	message(FATAL_ERROR "Wrong CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+endif()
 
 # Set the flags to cmake now
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_FLAGS} ${COMPILER_FLAGS}")
-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${COMPILER_FLAGS}")
+set(CMAKE_CXX_FLAGS "${CXX_FLAGS} ${COMPILER_FLAGS}")
+set(CMAKE_C_FLAGS "${COMPILER_FLAGS}")
 set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${LINKER_FLAGS}")
 
 ################################################################################
@@ -215,8 +173,6 @@ message("++ Lib install dir: ${LIB_INSTALL_DIR}")
 ################################################################################
 # Thirdparty                                                                   #
 ################################################################################
-include(ExternalProject)
-
 set(ANKI_EXTERN_SUB_DIRS tinyxml2 lua z)
 
 if((LINUX OR MACOS OR WINDOWS) AND GL)
@@ -233,66 +189,32 @@ endif()
 
 # SDL
 if(SDL)
-	ExternalProject_Add(
-		SDL2_PROJECT
-		DOWNLOAD_COMMAND ""
-		PREFIX "${CMAKE_CURRENT_BINARY_DIR}/sdl2_build"
-		SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/SDL2"
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/sdl2_build -DSDL_SHARED=OFF -DSDL_STATIC=ON 
-		-DCMAKE_BUILD_TYPE=Release -DDIRECTX=OFF -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DVIDEO_MIR=OFF 
-		-DVIDEO_WAYLAND=OFF -DSNDIO=OFF -DVIDEO_OPENGLES=OFF)
-
-	ExternalProject_Get_Property(SDL2_PROJECT install_dir)
-	set(SDL2_INSTALL_DIR ${install_dir})
-
-	defineStaticExternalLibrary(SDL2_PROJECT SDL2_LIB "${SDL2_INSTALL_DIR}/lib/libSDL2${CMAKE_STATIC_LIBRARY_SUFFIX}")
+	message("++ Configuring SDL2")
+	add_subdirectory(thirdparty/SDL2)
+	message("++ End configuring SDL2")
+
+	# Include first the build directory. 
+	set(SDL2_INCLUDE_DIRS "${CMAKE_CURRENT_BINARY_DIR}/thirdparty/SDL2/include" 
+		"${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/SDL2/include")
 else()
-	set(SDL2_INSTALL_DIR "")
+	set(SDL2_INCLUDE_DIRS "")
 endif()
 
 # Newton
-ExternalProject_Add(
-	NEWTON_PROJECT
-	DOWNLOAD_COMMAND ""
-	PREFIX "${CMAKE_CURRENT_BINARY_DIR}/newton_build"
-	SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/newton"
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/newton_build -DCMAKE_BUILD_TYPE=Release 
-	-DNEWTON_DEMOS_SANDBOX=OFF -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
-
-defineStaticExternalLibrary(NEWTON_PROJECT NEWTON_LIB "${CMAKE_CURRENT_BINARY_DIR}/newton_build/src/NEWTON_PROJECT-build/lib/libNewton${CMAKE_STATIC_LIBRARY_SUFFIX}")
-defineStaticExternalLibrary(NEWTON_PROJECT NEWTON_JOINTS_LIB "${CMAKE_CURRENT_BINARY_DIR}/newton_build/src/NEWTON_PROJECT-build/lib/libdCustomJoints${CMAKE_STATIC_LIBRARY_SUFFIX}")
-defineStaticExternalLibrary(NEWTON_PROJECT NEWTON_CONTAINERS_LIB "${CMAKE_CURRENT_BINARY_DIR}/newton_build/src/NEWTON_PROJECT-build/lib/libdContainers${CMAKE_STATIC_LIBRARY_SUFFIX}")
-defineStaticExternalLibrary(NEWTON_PROJECT NEWTON_MATH_LIB "${CMAKE_CURRENT_BINARY_DIR}/newton_build/src/NEWTON_PROJECT-build/lib/libdMath${CMAKE_STATIC_LIBRARY_SUFFIX}")
+message("++ Configuring Newton")
+add_subdirectory(thirdparty/newton)
+message("++ End configuring Newton")
 
 # freetype
-ExternalProject_Add(
-	FREETYPE_PROJECT
-	DOWNLOAD_COMMAND ""
-	PREFIX "${CMAKE_CURRENT_BINARY_DIR}/freetype_build"
-	SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/freetype"
-	CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/freetype_build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER})
-
-ExternalProject_Get_Property(FREETYPE_PROJECT install_dir)
-set(FREETYPE_INSTALL_DIR ${install_dir})
-defineStaticExternalLibrary(FREETYPE_PROJECT FREETYPE_LIB "${FREETYPE_INSTALL_DIR}/lib/libfreetype${CMAKE_STATIC_LIBRARY_SUFFIX}")
+message("++ Configuring freetype")
+add_subdirectory(thirdparty/freetype)
+message("++ End configuring freetype")
 
 # glslang
 if(VULKAN)
-	ExternalProject_Add(
-		GLSLANG_PROJECT
-		DOWNLOAD_COMMAND ""
-		PREFIX "${CMAKE_CURRENT_BINARY_DIR}/glslang_build"
-		SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/thirdparty/glslang"
-		CMAKE_ARGS -DCMAKE_INSTALL_PREFIX=${CMAKE_CURRENT_BINARY_DIR}/glslang_build -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER} -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
-
-	ExternalProject_Get_Property(GLSLANG_PROJECT install_dir)
-	set(GLSLANG_INSTALL_DIR ${install_dir})
-
-	defineStaticExternalLibrary(GLSLANG_PROJECT GLSLANG_LIB "${GLSLANG_INSTALL_DIR}/lib/libglslang${CMAKE_STATIC_LIBRARY_SUFFIX}")
-	defineStaticExternalLibrary(GLSLANG_PROJECT SPIRV_LIB "${GLSLANG_INSTALL_DIR}/lib/libSPIRV${CMAKE_STATIC_LIBRARY_SUFFIX}")
-	defineStaticExternalLibrary(GLSLANG_PROJECT OSD_LIB "${GLSLANG_INSTALL_DIR}/lib/libOSDependent${CMAKE_STATIC_LIBRARY_SUFFIX}")
-	defineStaticExternalLibrary(GLSLANG_PROJECT GLC_LIB "${GLSLANG_INSTALL_DIR}/lib/libOGLCompiler${CMAKE_STATIC_LIBRARY_SUFFIX}")
-	defineStaticExternalLibrary(GLSLANG_PROJECT HLSL_LIB "${GLSLANG_INSTALL_DIR}/lib/libHLSL${CMAKE_STATIC_LIBRARY_SUFFIX}")
+	message("++ Configuring glslang")
+	add_subdirectory(thirdparty/glslang)
+	message("++ End configuring glslang")
 endif()
 
 foreach(TMP ${ANKI_EXTERN_SUB_DIRS})
@@ -336,10 +258,29 @@ set(ANKI_VERSION_MAJOR 0)
 set(ANKI_VERSION_MINOR 1)
 message("++ AnKi version: ${ANKI_VERSION_MAJOR}.${ANKI_VERSION_MINOR}")
 
-if(ANKI_DEBUG)
-	set(ANKI_DEBUG 1)
+if(ANKI_EXTRA_CHECKS)
+	set(_ANKI_EXTRA_CHECKS 1)
 else()
-	set(ANKI_DEBUG 0)
+	set(_ANKI_EXTRA_CHECKS 0)
+endif()
+
+if(ANKI_ENABLE_SIMD)
+	set(_ANKI_ENABLE_SIMD 1)
+else()
+	set(_ANKI_ENABLE_SIMD 0)
+endif()
+
+if(${CMAKE_BUILD_TYPE} STREQUAL "Debug")
+	set(ANKI_DEBUG_SYMBOLS 1)
+	set(ANKI_OPTIMIZE 0)
+elseif(${CMAKE_BUILD_TYPE} STREQUAL "Release")
+	set(ANKI_DEBUG_SYMBOLS 0)
+	set(ANKI_OPTIMIZE 1)
+elseif(${CMAKE_BUILD_TYPE} STREQUAL "RelWithDbgInfo")
+	set(ANKI_DEBUG_SYMBOLS 1)
+	set(ANKI_OPTIMIZE 1)
+else()
+	message(FATAL_ERROR "Wrong CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
 endif()
 
 configure_file("src/anki/Config.h.cmake" "${CMAKE_CURRENT_BINARY_DIR}/anki/Config.h")
@@ -350,8 +291,9 @@ include_directories("src"
 	"thirdparty/tinyxml2/include" 
 	"thirdparty/lua" 
 	"thirdparty/z" 
-	"${SDL2_INSTALL_DIR}/include/SDL2/" 
-	"${FREETYPE_INSTALL_DIR}/include/freetype2/" 
+	"${SDL2_INCLUDE_DIRS}"
+	"thirdparty/freetype/include" 
+	"${CMAKE_CURRENT_BINARY_DIR}/thirdparty/freetype/include/freetype2"
 	"thirdparty/newton/coreLibrary_300/source/newton" 
 	"thirdparty/newton/packages/dCustomJoints"
 	"thirdparty/newton/packages/dContainers" 
@@ -372,7 +314,7 @@ if(ANDROID)
 endif()
 
 # AnKi compiler flags (Mainly warnings)
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -W -Wextra -Wstrict-aliasing -Wwrite-strings -Wunused -Wunused-variable -Wno-unused-parameter -Wundef -Wno-ignored-attributes -std=c++11 ")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pedantic -Wall -W -Wextra -Wstrict-aliasing -Wwrite-strings -Wunused -Wunused-variable -Wno-unused-parameter -Wundef -Wno-ignored-attributes -std=c++11")
 
 # Set platform specific
 if(LINUX)
@@ -408,14 +350,8 @@ else()
 	message(FATAL_ERROR "Unhandled case")
 endif()
 
-if(SDL)
-	link_directories(${SDL2_INSTALL_DIR}/lib)
-endif()
-
 link_directories(${FREETYPE_INSTALL_DIR}/lib)
 
-add_definitions(-DSPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
-
 # Add anki sub libraries
 set(ANKI_SUB_DIRS core script renderer scene ui event input physics resource misc gr collision math util)
 set(ANKI_LIBS "")
@@ -427,7 +363,7 @@ endforeach()
 
 add_library(anki src/anki/Dummy.cpp "${_SYS_SRC}")
 
-target_link_libraries(anki ${ANKI_LIBS} ankitinyxml2 ankilua ankiz FREETYPE_LIB ${_SYS})
+target_link_libraries(anki ${ANKI_LIBS} ankitinyxml2 ankilua ankiz ${_SYS})
 
 ################################################################################
 # AnKi extra                                                                   #

README.md

@@ -40,7 +40,7 @@ To build the release version:
 	$cd path/to/anki
 	$cd mkdir build
 	$cd ./build
-	$cmake ..
+	$cmake .. -DCMAKE_BUILD_TYPE=Release
 	$make
 
 To view and configure the build options you can use ccmake tool or other similar tool:

src/anki/Config.h.cmake

@@ -12,8 +12,9 @@
 #define ANKI_VERSION_MAJOR ${ANKI_VERSION_MAJOR}
 #define ANKI_REVISION ${ANKI_REVISION}
 
-#define ANKI_DEBUG ${ANKI_DEBUG}
-#define ANKI_ASSERTIONS ANKI_DEBUG
+#define ANKI_EXTRA_CHECKS ${_ANKI_EXTRA_CHECKS}
+#define ANKI_DEBUG_SYMBOLS ${ANKI_DEBUG_SYMBOLS}
+#define ANKI_OPTIMIZE ${ANKI_OPTIMIZE}
 
 // Operating system
 #define ANKI_OS_LINUX 1

src/anki/collision/GjkEpaInternal.h

@@ -76,7 +76,7 @@ public:
 		m_dist = -1.0;
 		m_originInside = 2;
 		m_dead = false;
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 		m_idx[0] = m_idx[1] = m_idx[2] = MAX_U32;
 #endif
 	}

src/anki/core/App.cpp

@@ -152,15 +152,26 @@ Error App::initInternal(const ConfigSet& config_, AllocAlignedCallback allocCb,
 
 	// Print a message
 	const char* buildType =
-#if !ANKI_DEBUG
-		"release";
+#if ANKI_OPTIMIZE
+		"optimized, "
 #else
-		"debug";
+		"NOT optimized, "
+#endif
+#if ANKI_DEBUG_SYMBOLS
+		"dbg symbols, "
+#else
+		"NO dbg symbols, "
+#endif
+#if ANKI_EXTRA_CHECKS
+		"extra checks";
+#else
+		"NO extra checks";
 #endif
 
 	ANKI_LOGI("Initializing application ("
 			  "version %u.%u, "
-			  "build %s %s, "
+			  "%s, "
+			  "date %s, "
 			  "commit %s)...",
 		ANKI_VERSION_MAJOR,
 		ANKI_VERSION_MINOR,

src/anki/core/CMakeLists.txt

@@ -11,5 +11,5 @@ add_library(ankicore ${ANKI_CORE_SOURCES})
 target_link_libraries(ankicore ankiscript ankirenderer ankiscene ankiresource ankiinput ankimisc ankiutil)
 
 if(SDL)
-	target_link_libraries(ankicore SDL2_LIB)
+	target_link_libraries(ankicore SDL2-static)
 endif()

src/anki/gr/CMakeLists.txt

@@ -5,7 +5,7 @@ if(GL)
 	set(EXTRA_LIBS "")
 else()
 	set(GR_BACKEND "vulkan")
-	set(EXTRA_LIBS GLSLANG_LIB SPIRV_LIB OSD_LIB GLC_LIB HLSL_LIB ankispirvcross)
+	set(EXTRA_LIBS glslang SPIRV HLSL OGLCompiler OSDependent ankispirvcross)
 endif()
 
 file(GLOB ANKI_GR_BACKEND_SOURCES ${GR_BACKEND}/*.cpp)

src/anki/gr/gl/Buffer.cpp

@@ -76,7 +76,7 @@ void* Buffer::map(PtrSize offset, PtrSize range, BufferMapAccessBit access)
 	U8* ptr = static_cast<U8*>(m_impl->m_persistentMapping);
 	ptr += offset;
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	ANKI_ASSERT(!m_impl->m_mapped);
 	m_impl->m_mapped = true;
 #endif
@@ -86,7 +86,7 @@ void* Buffer::map(PtrSize offset, PtrSize range, BufferMapAccessBit access)
 
 void Buffer::unmap()
 {
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	ANKI_ASSERT(m_impl->m_mapped);
 	m_impl->m_mapped = false;
 #endif

src/anki/gr/gl/BufferImpl.h

@@ -22,7 +22,7 @@ public:
 	BufferUsageBit m_usage = BufferUsageBit::NONE;
 	BufferMapAccessBit m_access = BufferMapAccessBit::NONE;
 	GLenum m_target = GL_NONE; ///< A guess
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	Bool m_mapped = false;
 #endif
 

src/anki/gr/gl/CommandBuffer.cpp

@@ -42,7 +42,7 @@ void CommandBuffer::init(CommandBufferInitInfo& inf)
 	m_impl.reset(getAllocator().newInstance<CommandBufferImpl>(&getManager()));
 	m_impl->init(inf);
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	m_impl->m_state.m_secondLevel = !!(inf.m_flags & CommandBufferFlag::SECOND_LEVEL);
 #endif
 

src/anki/gr/gl/CommandBufferImpl.cpp

@@ -35,11 +35,10 @@ void CommandBufferImpl::destroy()
 {
 	ANKI_TRACE_START_EVENT(GL_CMD_BUFFER_DESTROY);
 
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	if(!m_executed && m_firstCommand)
 	{
-		ANKI_GL_LOGW("Chain contains commands but never executed. "
-					 "This should only happen on exceptions");
+		ANKI_GL_LOGW("Chain contains commands but never executed. This should only happen on exceptions");
 	}
 #endif
 
@@ -63,7 +62,7 @@ Error CommandBufferImpl::executeAllCommands()
 {
 	ANKI_ASSERT(m_firstCommand != nullptr && "Empty command buffer");
 	ANKI_ASSERT(m_lastCommand != nullptr && "Empty command buffer");
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	m_executed = true;
 #endif
 

src/anki/gr/gl/CommandBufferImpl.h

@@ -49,7 +49,7 @@ public:
 	Bool8 m_immutable = false;
 	CommandBufferFlag m_flags;
 
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	Bool8 m_executed = false;
 #endif
 
@@ -91,7 +91,7 @@ public:
 	/// Fake that it's been executed
 	void makeExecuted()
 	{
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 		m_executed = true;
 #endif
 	}

src/anki/gr/gl/Error.h

@@ -15,7 +15,7 @@ namespace anki
 
 // Enable the exception on debug. Calling glGetError calls serialization
 
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 
 /// The function exits if there is an OpenGL error. Use it with the
 /// ANKI_CHECK_GL_ERROR macro

src/anki/gr/gl/GrManagerImpl.h

@@ -5,7 +5,7 @@
 
 #pragma once
 
-#include <anki/gr/Common.h>
+#include <anki/gr/gl/Common.h>
 
 namespace anki
 {

src/anki/gr/gl/ShaderImpl.cpp

@@ -11,7 +11,7 @@
 #include <anki/util/StringList.h>
 #include <anki/util/Logger.h>
 
-#define ANKI_DUMP_SHADERS ANKI_DEBUG
+#define ANKI_DUMP_SHADERS ANKI_EXTRA_CHECKS
 
 #if ANKI_DUMP_SHADERS
 #include <anki/util/File.h>

src/anki/gr/gl/StateTracker.h

@@ -28,7 +28,7 @@ public:
 	/// If it's false then there might be unset state.
 	Bool8 m_mayContainUnsetState = true;
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	Bool8 m_secondLevel = false;
 #endif
 

src/anki/gr/vulkan/BufferImpl.cpp

@@ -144,7 +144,7 @@ void* BufferImpl::map(PtrSize offset, PtrSize range, BufferMapAccessBit access)
 	void* ptr = getGrManagerImpl().getGpuMemoryManager().getMappedAddress(m_memHandle);
 	ANKI_ASSERT(ptr);
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	m_mapped = true;
 #endif
 

src/anki/gr/vulkan/BufferImpl.h

@@ -34,7 +34,7 @@ public:
 		ANKI_ASSERT(isCreated());
 		ANKI_ASSERT(m_mapped);
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		m_mapped = false;
 #endif
 		// TODO Flush or invalidate caches
@@ -72,7 +72,7 @@ private:
 	VkMemoryPropertyFlags m_memoryFlags = 0;
 	BufferUsageBit m_usage = BufferUsageBit::NONE;
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	Bool8 m_mapped = false;
 #endif
 

src/anki/gr/vulkan/CommandBufferImpl.h

@@ -176,7 +176,7 @@ private:
 	List<ShaderProgramPtr> m_progs;
 /// @}
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	// Debug stuff
 	Bool8 m_insideRenderPass = false;
 #endif

src/anki/gr/vulkan/GrManagerImpl.h

@@ -19,7 +19,7 @@
 namespace anki
 {
 
-#define ANKI_GR_MANAGER_DEBUG_MEMMORY ANKI_DEBUG
+#define ANKI_GR_MANAGER_DEBUG_MEMMORY ANKI_EXTRA_CHECKS
 
 // Forward
 class TextureFallbackUploader;

src/anki/gr/vulkan/ShaderImpl.cpp

@@ -10,7 +10,7 @@
 #include <glslang/SPIRV/GlslangToSpv.h>
 #include <SPIRV-Cross/spirv_cross.hpp>
 
-#define ANKI_DUMP_SHADERS ANKI_DEBUG
+#define ANKI_DUMP_SHADERS ANKI_EXTRA_CHECKS
 
 #if ANKI_DUMP_SHADERS
 #include <anki/util/File.h>

src/anki/math/Functions.cpp

@@ -18,7 +18,7 @@ static Scalar polynomialSinQuadrant(const Scalar a)
 template<typename Scalar>
 static void sinCosInternal(const Scalar a_, Scalar& sina, Scalar& cosa)
 {
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	sina = sin(a_);
 	cosa = cos(a_);
 #else

src/anki/physics/CMakeLists.txt

@@ -2,5 +2,5 @@ file(GLOB ANKI_PHYS_SOURCES *.cpp)
 file(GLOB ANKI_PHYS_HEADERS *.h)
 
 add_library(ankiphysics ${ANKI_PHYS_SOURCES} ${ANKI_PHYS_HEADERS})
-target_link_libraries(ankiphysics NEWTON_LIB NEWTON_JOINTS_LIB NEWTON_CONTAINERS_LIB NEWTON_MATH_LIB)
+target_link_libraries(ankiphysics NewtonStatic dCustomJoints dContainers dMath)
 

src/anki/physics/PhysicsCollisionShape.cpp

@@ -79,7 +79,7 @@ Error PhysicsTriangleSoup::create(PhysicsCollisionShapeInitInfo& init,
 		NewtonTreeCollisionAddFace(m_shape, 3, &facePos[0][0], sizeof(Vec3), 0);
 	}
 
-	const I optimize = !ANKI_DEBUG;
+	const I optimize = 1;
 	NewtonTreeCollisionEndBuild(m_shape, optimize);
 
 	return ErrorCode::NONE;

src/anki/renderer/Ms.cpp

@@ -56,7 +56,7 @@ Error Ms::createRt()
 		m_rt2);
 
 	AttachmentLoadOperation loadop = AttachmentLoadOperation::DONT_CARE;
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	loadop = AttachmentLoadOperation::CLEAR;
 #endif
 

src/anki/renderer/Sm.cpp

@@ -392,7 +392,7 @@ void Sm::prepareBuildCommandBuffers(RenderingContext& ctx)
 		ctx.m_sm.m_spotCommandBuffers.create(spotCastersCount * m_r->getThreadPool().getThreadsCount());
 
 		ctx.m_sm.m_spotCacheIndices.create(spotCastersCount);
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		memset(&ctx.m_sm.m_spotCacheIndices[0], 0xFF, sizeof(ctx.m_sm.m_spotCacheIndices[0]) * spotCastersCount);
 #endif
 
@@ -415,7 +415,7 @@ void Sm::prepareBuildCommandBuffers(RenderingContext& ctx)
 		ctx.m_sm.m_omniCommandBuffers.create(omniCastersCount * 6 * m_r->getThreadPool().getThreadsCount());
 
 		ctx.m_sm.m_omniCacheIndices.create(omniCastersCount);
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		memset(&ctx.m_sm.m_omniCacheIndices[0], 0xFF, sizeof(ctx.m_sm.m_omniCacheIndices[0]) * omniCastersCount);
 #endif
 

src/anki/scene/ReflectionProxyComponent.cpp

@@ -36,7 +36,7 @@ Error ReflectionProxyComponent::update(SceneNode& node, F32 prevTime, F32 crntTi
 			// Update the plane
 			face.m_plane.setFrom3Points(a, b, c);
 
-#if ANKI_ASSERTIONS == 1
+#if ANKI_EXTRA_CHECKS == 1
 			// Make sure that all points are co-planar
 			Vec4 n0 = (b - a).cross(c - b);
 			Vec4 n1 = (c - b).cross(d - c);

src/anki/scene/SceneNode.cpp

@@ -91,7 +91,7 @@ void SceneNode::addComponent(SceneComponent* comp, Bool transferOwnership)
 {
 	ANKI_ASSERT(comp);
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	Error err = iterateComponents([&](const SceneComponent& bcomp) -> Error {
 		ANKI_ASSERT(comp != &bcomp);
 		return ErrorCode::NONE;

src/anki/scene/Sector.cpp

@@ -326,7 +326,7 @@ void Sector::tryRemoveSpatialComponent(SpatialComponent* sp)
 	}
 	else
 	{
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		ANKI_ASSERT(findSpatialComponent(sp) == m_spatials.getEnd());
 #endif
 	}

src/anki/ui/CMakeLists.txt

@@ -1,4 +1,4 @@
 file(GLOB ANKI_UI_SOURCES *.cpp)
 
 add_library(ankiui ${ANKI_UI_SOURCES})
-target_link_libraries(ankiui ankiresource FREETYPE_LIB)
+target_link_libraries(ankiui ankiresource freetype)

src/anki/util/Assert.cpp

@@ -14,7 +14,7 @@
 namespace anki
 {
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 
 void akassert(const char* exprTxt, const char* file, int line, const char* func)
 {

src/anki/util/Assert.h

@@ -8,7 +8,7 @@
 #include <anki/Config.h>
 
 /// Assertion. Print an error and stop the debugger (if it runs through a debugger) and then abort.
-#if !ANKI_ASSERTIONS
+#if !ANKI_EXTRA_CHECKS
 #define ANKI_ASSERT(x) ((void)0)
 #define ANKI_ASSERTS_ENABLED 0
 #else

src/anki/util/DynamicArray.h

@@ -345,7 +345,7 @@ public:
 
 	~WeakArray()
 	{
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		m_data = nullptr;
 		m_size = 0;
 #endif

src/anki/util/Functions.h

@@ -166,7 +166,7 @@ struct RemovePointer<T*>
 template<typename To, typename From>
 To staticCastPtr(From from)
 {
-#if ANKI_DEBUG == 1
+#if ANKI_EXTRA_CHECKS
 	To ptr = dynamic_cast<To>(from);
 	ANKI_ASSERT(ptr != nullptr);
 	return ptr;

src/anki/util/Memory.cpp

@@ -17,7 +17,7 @@
 namespace anki
 {
 
-#define ANKI_MEM_SIGNATURES ANKI_DEBUG
+#define ANKI_MEM_SIGNATURES ANKI_EXTRA_CHECKS
 
 #if ANKI_MEM_SIGNATURES
 using Signature = U32;
@@ -40,7 +40,7 @@ static Signature computeSignature(void* ptr)
 template<typename TPtr, typename TSize>
 static void invalidateMemory(TPtr ptr, TSize size)
 {
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	memset(static_cast<void*>(ptr), 0xCC, size);
 #endif
 }

src/anki/util/Memory.h

@@ -22,7 +22,7 @@ class SpinLock;
 /// @addtogroup util_memory
 /// @{
 
-#define ANKI_MEM_USE_SIGNATURES ANKI_DEBUG
+#define ANKI_MEM_USE_SIGNATURES ANKI_EXTRA_CHECKS
 
 /// Allocate aligned memory
 void* mallocAligned(PtrSize size, PtrSize alignmentBytes);

src/anki/util/StdTypes.h

@@ -179,7 +179,7 @@ private:
 	} while(0)
 
 /// Macro to nuliffy a pointer on debug builds.
-#if ANKI_DEBUG == 1
+#if ANKI_EXTRA_CHECKS
 #define ANKI_DBG_NULLIFY = {}
 #else
 #define ANKI_DBG_NULLIFY

src/anki/util/Thread.h

@@ -75,7 +75,7 @@ private:
 	ThreadCallback m_callback = nullptr; ///< The callback
 	void* m_userData = nullptr; ///< The user date to pass to the callback
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	Bool8 m_started = false;
 #endif
 };

src/anki/util/ThreadHive.cpp

@@ -278,7 +278,7 @@ ThreadHive::Task* ThreadHive::getNewTask()
 					m_tail = prevTask;
 				}
 
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 				task->m_next = nullptr;
 #endif
 				break;

src/anki/util/ThreadPosix.cpp

@@ -91,7 +91,7 @@ void Thread::start(void* userData, ThreadCallback callback, I pinToCore)
 	}
 	else
 	{
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		m_started = true;
 #endif
 	}
@@ -109,7 +109,7 @@ Error Thread::join()
 		ANKI_LOGF("pthread_join() failed");
 	}
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	m_started = false;
 #endif
 

src/anki/util/ThreadWindows.cpp

@@ -75,7 +75,7 @@ void Thread::start(void* userData, ThreadCallback callback, I pinToCore)
 	}
 	else
 	{
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 		m_started = true;
 #endif
 	}
@@ -105,7 +105,7 @@ Error Thread::join()
 
 	m_impl = nullptr;
 
-#if ANKI_ASSERTIONS
+#if ANKI_EXTRA_CHECKS
 	m_started = false;
 #endif
 

src/anki/util/Visitor.h

@@ -226,7 +226,7 @@ template<typename TBase, typename... Types>
 class VisitableCommonBase
 {
 public:
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 	// Allow dynamic cast in acceptVisitor
 	virtual ~VisitableCommonBase()
 	{
@@ -290,7 +290,7 @@ private:
 		{
 		case 0:
 		{
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 			TFirst* base = dynamic_cast<TFirst*>(this);
 			ANKI_ASSERT(base != nullptr);
 #else
@@ -317,7 +317,7 @@ private:
 		{
 		case i:
 		{
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 			TSecond* base = dynamic_cast<TSecond*>(this);
 			ANKI_ASSERT(base != nullptr);
 #else
@@ -343,7 +343,7 @@ private:
 		{
 		case 0:
 		{
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 			const TFirst* base = dynamic_cast<const TFirst*>(this);
 			ANKI_ASSERT(base != nullptr);
 #else
@@ -370,7 +370,7 @@ private:
 		{
 		case i:
 		{
-#if ANKI_DEBUG
+#if ANKI_EXTRA_CHECKS
 			const TSecond* base = dynamic_cast<const TSecond*>(this);
 			ANKI_ASSERT(base != nullptr);
 #else

thirdparty

@@ -1 +1 @@
-Subproject commit 7d46a7d7ec130ddc1f77d0a8eb1d6b27eb35415b
+Subproject commit d7016db5e3d39b110f94c47340b8f6b51958d3f1