Skip to content

Commit 2fcf97e

Browse files
pollendpollend
committed
Merge remote-tracking branch 'upstream/master' into feature/add-support-xcb
2 parents 80a21c1 + 6a17dc8 commit 2fcf97e

File tree

394 files changed

+7033
-3774
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

394 files changed

+7033
-3774
lines changed

‎3rdparty/CMakeLists.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,11 @@ add_subdirectory(openssl openssl EXCLUDE_FROM_ALL)
2121

2222
# DXC
2323
set(SPIRV-Headers_SOURCE_DIR "${CMAKE_CURRENT_SOURCE_DIR}/dxc/dxc/external/SPIRV-Headers")
24-
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
24+
if(WIN32)
25+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /fp:fast")
26+
elseif(UNIX)
27+
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -ffast-math")
28+
endif()
2529
option(_NBL_ENABLE_DXC_COMPILE_TESTS_ "Enable it in order to test compilation of Nabla shaders at build time" OFF)
2630
option(_NBL_DXC_COMPILE_TESTS_ENABLE_CMAKE_LOG_ "Enable more verbose log when creating DXC compile test target - only for Nabla developers!" OFF)
2731
set(_NBL_DXC_CT_PREFIX_CMAKE_LOG_DEBUG_ "[DXC_CT]:" CACHE INTERNAL "only for Nabla developers")
@@ -50,7 +54,7 @@ endif()
5054

5155

5256
# TODO: redo
53-
find_package(Wayland) # TODO: remove, load Wayland dynamically
57+
# find_package(Wayland) # TODO: remove, load Wayland dynamically
5458

5559

5660
# zlib (target is zlibstatic)

‎3rdparty/dxc/CMakeLists.txt‎

Lines changed: 18 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,24 @@ else()
6060
endif()
6161

6262
set(DXC_BUILD_DIR "${CMAKE_CURRENT_BINARY_DIR}/build" CACHE INTERNAL "")
63-
execute_process(COMMAND "${CMAKE_COMMAND}" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
64-
RESULT_VARIABLE DXC_CMAKE_RESULT
65-
OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
66-
)
63+
64+
if(WIN32)
65+
execute_process(COMMAND "${CMAKE_COMMAND}" -C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake" -S "${CMAKE_CURRENT_SOURCE_DIR}/dxc" -B "${DXC_BUILD_DIR}" -G "${CMAKE_GENERATOR}" "-Ax64" -T "${CMAKE_GENERATOR_TOOLSET}" ${NBL_DXC_CMAKE_OPTIONS}
66+
RESULT_VARIABLE DXC_CMAKE_RESULT
67+
OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
68+
)
69+
else()
70+
execute_process(COMMAND "${CMAKE_COMMAND}"
71+
-S "${CMAKE_CURRENT_SOURCE_DIR}/dxc"
72+
-C "${CMAKE_CURRENT_SOURCE_DIR}/dxc/cmake/caches/PredefinedParams.cmake"
73+
-G "${CMAKE_GENERATOR}"
74+
-T "${CMAKE_GENERATOR_TOOLSET}"
75+
-B "${DXC_BUILD_DIR}"
76+
-D "CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}"
77+
RESULT_VARIABLE DXC_CMAKE_RESULT
78+
OUTPUT_VARIABLE DXC_CMAKE_STREAM_PIPE
79+
)
80+
endif()
6781

6882
if(NOT "${DXC_CMAKE_RESULT}" STREQUAL "0")
6983
message(FATAL_ERROR "${DXC_CMAKE_STREAM_PIPE}")

‎3rdparty/dxc/test/test.cpp‎

-293 Bytes
Binary file not shown.

‎3rdparty/pstl/CMakeLists.txt‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
1-
if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang supported
1+
if(NBL_BUILD_DPL AND CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang ifsupported
22
get_filename_component(CCBD_ABSOLUTE "${CMAKE_CURRENT_BINARY_DIR}" ABSOLUTE)
33

4+
if (NBL_BUILD_DPL)
5+
set(_NBL_BUILD_DPL_ ${NBL_BUILD_DPL})
6+
endif()
7+
48
set(TBB_INSTALL_VARS ON CACHE BOOL "" FORCE)
59
set(TBB_TEST OFF CACHE BOOL "" FORCE)
610
set(TBB_STRICT ON CACHE BOOL "" FORCE)
@@ -45,7 +49,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "Clang") # only non-multi-generators and clang
4549
SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/oneDPL
4650
BINARY_DIR ${ONEDPL_BUILD}
4751
CMAKE_ARGS ${CMAKE_ARGS_ONEDPL}
48-
BUILD_COMMAND cmake --build ${ONEDPL_BUILD} --target build-all
52+
BUILD_COMMAND cmake --build ${ONEDPL_BUILD}
4953
INSTALL_COMMAND cmake --install ${ONEDPL_BUILD} --prefix ${ONEDPL_INSTALL_DIR}
5054
USES_TERMINAL_BUILD 1
5155
COMMENT "Building oneDPL..."

‎3rdparty/tcpp‎

‎CMakeLists.txt‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ include(ExternalProject)
1212
include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/toolchains/android/build.cmake)
1313

1414
project(Nabla LANGUAGES CXX C)
15+
enable_language(C CXX ASM)
1516

1617
option(NBL_STATIC_BUILD "" ON) # ON for static builds, OFF for shared
1718
option(NBL_DYNAMIC_MSVC_RUNTIME "" OFF)
@@ -260,6 +261,8 @@ endif()
260261
#uncomment in the future
261262
#option(NBL_TARGET_ARCH_ARM "Build for ARM?" OFF)
262263

264+
option(NBL_BUILD_DPL "Enable DPL (Dynamic Parallelism Library)" OFF)
265+
263266
option(NBL_PCH "Enable pre-compiled header" ON)
264267

265268
option(NBL_FAST_MATH "Enable fast low-precision math" ON)

‎cmake/common.cmake‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
8484

8585
target_include_directories(${EXECUTABLE_NAME}
8686
PUBLIC "${NBL_ROOT_PATH}/examples_tests/common"
87+
PUBLIC "${NBL_ROOT_PATH_BINARY}/include"
8788
PUBLIC ../../include
8889
PRIVATE ${_EXTRA_INCLUDES}
8990
)

‎examples_tests‎

‎include/CConcurrentObjectCache.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace nbl { namespace core
1313

1414
namespace impl
1515
{
16-
struct NBL_API NBL_FORCE_EBO CConcurrentObjectCacheBase
16+
struct NBL_FORCE_EBO CConcurrentObjectCacheBase
1717
{
1818
CConcurrentObjectCacheBase() = default;
1919
// explicitely making concurrent caches non-copy-and-move-constructible and non-copy-and-move-assignable
@@ -30,7 +30,7 @@ namespace impl
3030
};
3131

3232
template<typename CacheT>
33-
class NBL_API CMakeCacheConcurrent : private impl::CConcurrentObjectCacheBase, private CacheT
33+
class CMakeCacheConcurrent : private impl::CConcurrentObjectCacheBase, private CacheT
3434
{
3535
using BaseCache = CacheT;
3636
using K = typename BaseCache::KeyType_impl;

‎include/CObjectCache.h‎

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -28,65 +28,65 @@ namespace nbl::core
2828
#ifndef INTELLISENSE_WORKAROUND
2929
namespace impl
3030
{
31-
struct NBL_API NBL_FORCE_EBO NBL_NO_VTABLE CMultiCache_tag {};
31+
struct NBL_FORCE_EBO NBL_NO_VTABLE CMultiCache_tag {};
3232

3333
template<template<typename...> class, template<typename...> class>
34-
struct NBL_API is_same_templ : std::false_type {};
34+
struct is_same_templ : std::false_type {};
3535

3636
template<template<typename...> class T>
37-
struct NBL_API is_same_templ<T, T> : std::true_type {};
37+
struct is_same_templ<T, T> : std::true_type {};
3838

3939
template <typename T>
40-
struct NBL_API is_string : std::false_type {};
40+
struct is_string : std::false_type {};
4141
template <typename C, typename T, typename A>
42-
struct NBL_API is_string<std::basic_string<C, T, A>> : std::true_type {};
42+
struct is_string<std::basic_string<C, T, A>> : std::true_type {};
4343

4444
template<template<typename...> class T>
45-
struct NBL_API is_multi_container : std::false_type {};
45+
struct is_multi_container : std::false_type {};
4646
template<>
47-
struct NBL_API is_multi_container<std::multimap> : std::true_type {};
47+
struct is_multi_container<std::multimap> : std::true_type {};
4848
template<>
49-
struct NBL_API is_multi_container<std::unordered_multimap> : std::true_type {};
49+
struct is_multi_container<std::unordered_multimap> : std::true_type {};
5050

5151
template<template<typename...> class>
52-
struct NBL_API is_assoc_container : std::false_type {};
52+
struct is_assoc_container : std::false_type {};
5353
template<>
54-
struct NBL_API is_assoc_container<std::map> : std::true_type {};
54+
struct is_assoc_container<std::map> : std::true_type {};
5555
template<>
56-
struct NBL_API is_assoc_container<std::unordered_map> : std::true_type {};
56+
struct is_assoc_container<std::unordered_map> : std::true_type {};
5757
template<>
58-
struct NBL_API is_assoc_container<std::multimap> : std::true_type {};
58+
struct is_assoc_container<std::multimap> : std::true_type {};
5959
template<>
60-
struct NBL_API is_assoc_container<std::unordered_multimap> : std::true_type {};
60+
struct is_assoc_container<std::unordered_multimap> : std::true_type {};
6161

6262
template<typename K, typename...>
63-
struct NBL_API NBL_FORCE_EBO NBL_NO_VTABLE PropagKeyTypeTypedef_ { using KeyType = K; };
63+
struct NBL_FORCE_EBO NBL_NO_VTABLE PropagKeyTypeTypedef_ { using KeyType = K; };
6464
template<typename ...K>
65-
struct NBL_API NBL_FORCE_EBO NBL_NO_VTABLE PropagKeyTypeTypedef : PropagKeyTypeTypedef_<K...> {};
65+
struct NBL_FORCE_EBO NBL_NO_VTABLE PropagKeyTypeTypedef : PropagKeyTypeTypedef_<K...> {};
6666

6767
template<typename T, typename ...K>
68-
struct NBL_API NBL_FORCE_EBO NBL_NO_VTABLE PropagTypedefs : PropagKeyTypeTypedef<K...> { using CachedType = T; };
68+
struct NBL_FORCE_EBO NBL_NO_VTABLE PropagTypedefs : PropagKeyTypeTypedef<K...> { using CachedType = T; };
6969

7070
template<
7171
template<typename...> class ContainerT_T,
7272
typename Alloc,
7373
typename T, //value type for container
7474
typename ...K //optionally key type for std::map/std::unordered_map
7575
>
76-
struct NBL_API NBL_FORCE_EBO CObjectCacheBase
76+
struct NBL_FORCE_EBO CObjectCacheBase
7777
{
7878
private:
7979
template<bool isAssoc, template<typename...> class C>
8080
struct help;
8181

8282
template<template<typename...> class C>
83-
struct NBL_API help<true, C>
83+
struct help<true, C>
8484
{
8585
template<typename KK, typename TT, typename AAlloc>
8686
using container_t = C<KK, TT, std::less<KK>, AAlloc>;
8787
};
8888
template<template<typename...> class C>
89-
struct NBL_API help<false, C>
89+
struct help<false, C>
9090
{
9191
template<typename TT, typename AAlloc>
9292
using container_t = C<TT, AAlloc>;
@@ -239,15 +239,15 @@ namespace impl
239239
};
240240

241241
template<template<typename...> class ContainerT_T, typename ContainerT, bool ForMultiCache, bool IsAssocContainer = impl::is_assoc_container<ContainerT_T>::value>
242-
struct NBL_API CPreInsertionVerifier;
242+
struct CPreInsertionVerifier;
243243
template<template<typename...> class ContainerT_T, typename ContainerT, bool IsAssocContainer>
244-
struct NBL_API CPreInsertionVerifier<ContainerT_T, ContainerT, true, IsAssocContainer>
244+
struct CPreInsertionVerifier<ContainerT_T, ContainerT, true, IsAssocContainer>
245245
{
246246
template<typename ...Ts>
247247
static bool verify(Ts...) { return true; }
248248
};
249249
template<template<typename...> class ContainerT_T, typename ContainerT>
250-
struct NBL_API CPreInsertionVerifier<ContainerT_T, ContainerT, false, false>
250+
struct CPreInsertionVerifier<ContainerT_T, ContainerT, false, false>
251251
{
252252
static bool verify(const ContainerT& _container, const typename ContainerT::iterator& _itr, const typename ContainerT::value_type::first_type& _key)
253253
{
@@ -258,7 +258,7 @@ namespace impl
258258
}
259259
};
260260
template<template<typename...> class ContainerT_T, typename ContainerT>
261-
struct NBL_API CPreInsertionVerifier<ContainerT_T, ContainerT, false, true>
261+
struct CPreInsertionVerifier<ContainerT_T, ContainerT, false, true>
262262
{
263263
static bool verify(const std::pair<typename ContainerT::iterator, bool>& _insertionRes)
264264
{
@@ -311,15 +311,15 @@ namespace impl
311311
typename T, //value type for container
312312
typename ...K //optionally key type for std::map/std::unordered_map
313313
>
314-
struct NBL_API CMultiObjectCacheBase;
314+
struct CMultiObjectCacheBase;
315315

316316
template<
317317
template<typename...> class ContainerT_T,
318318
typename Alloc,
319319
typename T, //value type for container
320320
typename ...K //optionally key type for std::map/std::unordered_map
321321
>
322-
struct NBL_API NBL_FORCE_EBO CMultiObjectCacheBase<true, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>, public CMultiCache_tag
322+
struct NBL_FORCE_EBO CMultiObjectCacheBase<true, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>, public CMultiCache_tag
323323
{
324324
private:
325325
using Base = CObjectCacheBase<ContainerT_T, Alloc, T, K...>;
@@ -351,7 +351,7 @@ namespace impl
351351
typename T, //value type for container
352352
typename ...K //optionally key type for std::map/std::unordered_map
353353
>
354-
struct NBL_API NBL_FORCE_EBO CMultiObjectCacheBase<false, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>, public CMultiCache_tag
354+
struct NBL_FORCE_EBO CMultiObjectCacheBase<false, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>, public CMultiCache_tag
355355
{
356356
private:
357357
using Base = CObjectCacheBase<ContainerT_T, Alloc, T, K...>;
@@ -400,7 +400,7 @@ namespace impl
400400
typename T, //value type for container
401401
typename ...K //optionally key type for std::map/std::unordered_map
402402
>
403-
struct NBL_API NBL_FORCE_EBO CMultiObjectCacheBaseExt : public CMultiObjectCacheBase<!IsVectorContainer, ContainerT_T, Alloc, T, K...>
403+
struct NBL_FORCE_EBO CMultiObjectCacheBaseExt : public CMultiObjectCacheBase<!IsVectorContainer, ContainerT_T, Alloc, T, K...>
404404
{
405405
private:
406406
using Base = CMultiObjectCacheBase<!IsVectorContainer, ContainerT_T, Alloc, T, K...>;
@@ -478,7 +478,7 @@ namespace impl
478478
typename T, //value type for container
479479
typename ...K //optionally key type for std::map/std::unordered_map
480480
>
481-
struct NBL_API NBL_FORCE_EBO CUniqObjectCacheBase<true, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>
481+
struct NBL_FORCE_EBO CUniqObjectCacheBase<true, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>
482482
{
483483
private:
484484
using Base = CObjectCacheBase<ContainerT_T, Alloc, T, K...>;
@@ -513,7 +513,7 @@ namespace impl
513513
typename T, //value type for container
514514
typename ...K //optionally key type for std::map/std::unordered_map
515515
>
516-
struct NBL_API NBL_FORCE_EBO CUniqObjectCacheBase<false, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>
516+
struct NBL_FORCE_EBO CUniqObjectCacheBase<false, ContainerT_T, Alloc, T, K...> : public CObjectCacheBase<ContainerT_T, Alloc, T, K...>
517517
{
518518
private:
519519
using Base = CObjectCacheBase<ContainerT_T, Alloc, T, K...>;
@@ -549,7 +549,7 @@ namespace impl
549549
typename T, //value type for container
550550
typename ...K //optionally key type for std::map/std::unordered_map
551551
>
552-
struct NBL_API CUniqObjectCacheBaseExt : public CUniqObjectCacheBase<isVectorContainer, ContainerT_T, Alloc, T, K...>
552+
struct CUniqObjectCacheBaseExt : public CUniqObjectCacheBase<isVectorContainer, ContainerT_T, Alloc, T, K...>
553553
{
554554
private:
555555
using Base = CUniqObjectCacheBase<isVectorContainer, ContainerT_T, Alloc, T, K...>;
@@ -603,7 +603,7 @@ namespace impl
603603
typename T, //value type for container
604604
typename ...K //optionally key type for std::map/std::unordered_map
605605
>
606-
struct NBL_API NBL_FORCE_EBO CDirectCacheBase :
606+
struct NBL_FORCE_EBO CDirectCacheBase :
607607
public std::conditional<forMultiCache, CMultiObjectCacheBaseExt<isVectorContainer, ContainerT_T, Alloc, T, K...>, CUniqObjectCacheBaseExt<isVectorContainer, ContainerT_T, Alloc, T, K...>>::type
608608
{
609609
private:
@@ -687,10 +687,10 @@ namespace impl
687687
namespace impl
688688
{
689689
template<template<typename...> class Container, typename K, typename V>
690-
struct NBL_API key_val_pair_type_for { using type = std::pair<const K, V>; };
690+
struct key_val_pair_type_for { using type = std::pair<const K, V>; };
691691

692692
template<typename K, typename V>
693-
struct NBL_API key_val_pair_type_for<std::vector, K, V> { using type = std::pair<K, V>; };
693+
struct key_val_pair_type_for<std::vector, K, V> { using type = std::pair<K, V>; };
694694
}
695695
template<
696696
typename K,
@@ -707,7 +707,7 @@ template<
707707
template<typename...> class ContainerT_T,
708708
typename Alloc
709709
>
710-
class NBL_API NBL_FORCE_EBO CMultiObjectCache<K, T, ContainerT_T, Alloc, true> :
710+
class NBL_FORCE_EBO CMultiObjectCache<K, T, ContainerT_T, Alloc, true> :
711711
public impl::CDirectMultiCacheBase<true, ContainerT_T, Alloc, std::pair<K, T>>,
712712
public impl::PropagTypedefs<T, K>
713713
{
@@ -723,7 +723,7 @@ template<
723723
template<typename...> class ContainerT_T,
724724
typename Alloc
725725
>
726-
class NBL_API NBL_FORCE_EBO CMultiObjectCache<K, T, ContainerT_T, Alloc, false> :
726+
class NBL_FORCE_EBO CMultiObjectCache<K, T, ContainerT_T, Alloc, false> :
727727
public impl::CDirectMultiCacheBase<false, ContainerT_T, Alloc, T, const K>,
728728
public impl::PropagTypedefs<T, const K>
729729
{
@@ -751,7 +751,7 @@ template<
751751
template<typename...> class ContainerT_T,
752752
typename Alloc
753753
>
754-
class NBL_API NBL_FORCE_EBO CObjectCache<K, T, ContainerT_T, Alloc, true> :
754+
class NBL_FORCE_EBO CObjectCache<K, T, ContainerT_T, Alloc, true> :
755755
public impl::CDirectUniqCacheBase<true, ContainerT_T, Alloc, std::pair<K, T>>,
756756
public impl::PropagTypedefs<T, K>
757757
{
@@ -768,7 +768,7 @@ template<
768768
template<typename...> class ContainerT_T,
769769
typename Alloc
770770
>
771-
class NBL_API NBL_FORCE_EBO CObjectCache<K, T, ContainerT_T, Alloc, false> :
771+
class NBL_FORCE_EBO CObjectCache<K, T, ContainerT_T, Alloc, false> :
772772
public impl::CDirectUniqCacheBase<false, ContainerT_T, Alloc, T, const K>,
773773
public impl::PropagTypedefs<T, const K>
774774
{
@@ -784,7 +784,7 @@ class NBL_API NBL_FORCE_EBO CObjectCache<K, T, ContainerT_T, Alloc, false> :
784784
// BELOW SHALL NOT BE COMPILED! it's because Visual Studio's Intellisense crashes with the code above and doesn't even highlight syntax in any file which includes this
785785

786786
template<typename K, typename T, template<typename...> class C = std::vector, typename A = core::allocator<std::pair<const K, T*>>>
787-
class NBL_API CObjectCache
787+
class CObjectCache
788788
{
789789
public:
790790
CObjectCache() = default;
@@ -806,7 +806,7 @@ class NBL_API CObjectCache
806806
size_t getSize() const;
807807
};
808808
template<typename K, typename T, template<typename...> class C = std::vector, typename A = core::allocator<std::pair<const K, T*>>>
809-
class NBL_API CMultiObjectCache
809+
class CMultiObjectCache
810810
{
811811
public:
812812
CMultiObjectCache() = default;

0 commit comments

Comments
 (0)