Skip to content

Commit 0404559

Browse files
devshgraphicsprogrammingdevshgraphicsprogramming
committed
remove NBL_API, only NBL_API2 is left now
1 parent a116989 commit 0404559

File tree

333 files changed

+619
-624
lines changed

Some content is hidden

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

333 files changed

+619
-624
lines changed

‎include/CConcurrentObjectCache.h

+2-2
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

+39-39
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;

‎include/ICameraSceneNode.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Because the ICameraScenNode is a SceneNode, it can be attached to any
2323
other scene node, and will follow its parents movement, rotation and so
2424
on.
2525
*/
26-
class NBL_API ICameraSceneNode : public ISceneNode
26+
class ICameraSceneNode : public ISceneNode
2727
{
2828
public:
2929

‎include/ISceneNodeAnimatorCameraFPS.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ namespace scene
1818
/** This scene node animator can be attached to a camera to make it act
1919
like a first person shooter
2020
*/
21-
class NBL_API ISceneNodeAnimatorCameraFPS : public ISceneNodeAnimator
21+
class ISceneNodeAnimatorCameraFPS : public ISceneNodeAnimator
2222
{
2323
public:
2424

‎include/ISceneNodeAnimatorCameraMaya.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace scene
2323
the current orbit radius the camera moves on. Distance can be changed via the setter
2424
or by mouse events.
2525
*/
26-
class NBL_API ISceneNodeAnimatorCameraMaya : public ISceneNodeAnimator
26+
class ISceneNodeAnimatorCameraMaya : public ISceneNodeAnimator
2727
{
2828
public:
2929

‎include/ISceneNodeAnimatorCameraModifiedMaya.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ namespace scene
2323
the current orbit radius the camera moves on. Distance can be changed via the setter
2424
or by mouse events.
2525
*/
26-
class NBL_API ISceneNodeAnimatorCameraModifiedMaya : public ISceneNodeAnimator
26+
class ISceneNodeAnimatorCameraModifiedMaya : public ISceneNodeAnimator
2727
{
2828
public:
2929

‎include/IVideoCapabilityReporter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace nbl
1212
namespace video
1313
{
1414
//! .
15-
class NBL_API NBL_FORCE_EBO IVideoCapabilityReporter
15+
class NBL_FORCE_EBO IVideoCapabilityReporter
1616
{
1717
public:
1818
//! Get type of video driver

‎include/IVideoDriver.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ namespace video
1313
{
1414
#if 0
1515
//! Legacy and deprecated system
16-
class NBL_API IVideoDriver : public IDriver
16+
class IVideoDriver : public IDriver
1717
{
1818
public:
1919
//!

‎include/SColor.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ namespace video
6262
stores the color values in 4 floats.
6363
This class must consist of only one uint32_t and must not use virtual functions.
6464
*/
65-
class NBL_API SColor
65+
class SColor
6666
{
6767
public:
6868

@@ -177,7 +177,7 @@ namespace video
177177
Another, faster way to define colors is using the class SColor, which
178178
stores the color values in a single 32 bit integer.
179179
*/
180-
class NBL_API SColorf : private core::vectorSIMDf
180+
class SColorf : private core::vectorSIMDf
181181
{
182182
public:
183183
//! Default constructor for SColorf.

‎include/SIMDswizzle.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#define FAST_FLOAT_SHUFFLE(X,Y) _mm_castsi128_ps(_mm_shuffle_epi32(_mm_castps_si128(X),Y))
99

1010
template <class T, class X>
11-
class NBL_API NBL_FORCE_EBO SIMD_32bitSwizzleAble
11+
class NBL_FORCE_EBO SIMD_32bitSwizzleAble
1212
{
1313
template<int mask>
1414
inline X shuffleFunc(X reg) const;

‎include/dimension2d.h

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,11 @@ namespace nbl
1414
namespace core
1515
{
1616
template <class T>
17-
class NBL_API vector2d;
17+
class vector2d;
1818

1919
//! Specifies a 2 dimensional size.
2020
template <class T>
21-
class NBL_API dimension2d // : public AllocationOverrideDefault
21+
class dimension2d // : public AllocationOverrideDefault
2222
{
2323
public:
2424
//! Default constructor for empty dimension

‎include/line3d.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ namespace core
1515

1616
//! 3D line between two points with intersection methods.
1717
template <class T>
18-
class NBL_API line3d// : public AllocationOverrideDefault
18+
class line3d// : public AllocationOverrideDefault
1919
{
2020
public:
2121

‎include/matrix3x4SIMD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class matrix4x3;
1717
static_assert(_NBL_MATRIX_ALIGNMENT>=_NBL_VECTOR_ALIGNMENT,"Matrix must be equally or more aligned than vector!");
1818

1919
//! Equivalent of GLSL's mat4x3
20-
class NBL_API matrix3x4SIMD// : private AllocationOverrideBase<_NBL_MATRIX_ALIGNMENT> EBO inheritance problem w.r.t `rows[3]`
20+
class matrix3x4SIMD// : private AllocationOverrideBase<_NBL_MATRIX_ALIGNMENT> EBO inheritance problem w.r.t `rows[3]`
2121
{
2222
public:
2323
_NBL_STATIC_INLINE_CONSTEXPR uint32_t VectorCount = 3u;

‎include/matrix4SIMD.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ template<typename T>
1616
class aabbox3d;
1717

1818

19-
class NBL_API matrix4SIMD// : public AlignedBase<_NBL_SIMD_ALIGNMENT> don't inherit from AlignedBase (which is empty) because member `rows[4]` inherits from it as well
19+
class matrix4SIMD// : public AlignedBase<_NBL_SIMD_ALIGNMENT> don't inherit from AlignedBase (which is empty) because member `rows[4]` inherits from it as well
2020
{
2121
public:
2222
_NBL_STATIC_INLINE_CONSTEXPR uint32_t VectorCount = 4u;

0 commit comments

Comments
 (0)