Skip to content

Commit 0df8d77

Browse files
minor adjustments and improvements
1 parent 3dced4a commit 0df8d77

File tree

11 files changed

+26
-11
lines changed

11 files changed

+26
-11
lines changed

include/nbl/system/CColoredStdoutLoggerANSI.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ namespace nbl::system
1212
class CColoredStdoutLoggerANSI : public IThreadsafeLogger
1313
{
1414
public:
15-
inline CColoredStdoutLoggerANSI(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
15+
inline CColoredStdoutLoggerANSI(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::DefaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
1616

1717
private:
1818
// more info about how this works: https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797

include/nbl/system/CColoredStdoutLoggerWin32.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class NBL_API2 CColoredStdoutLoggerWin32 : public IThreadsafeLogger
4646
}
4747

4848
public:
49-
CColoredStdoutLoggerWin32(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask());
49+
CColoredStdoutLoggerWin32(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::DefaultLogMask());
5050
};
5151

5252
#endif

include/nbl/system/CFileLogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace nbl::system
1010
class CFileLogger : public IThreadsafeLogger
1111
{
1212
public:
13-
CFileLogger(core::smart_refctd_ptr<IFile>&& _file, const bool append, const core::bitflag<E_LOG_LEVEL> logLevelMask=ILogger::defaultLogMask())
13+
CFileLogger(core::smart_refctd_ptr<IFile>&& _file, const bool append, const core::bitflag<E_LOG_LEVEL> logLevelMask=ILogger::DefaultLogMask())
1414
: IThreadsafeLogger(logLevelMask), m_file(std::move(_file)), m_pos(append ? m_file->getSize():0ull)
1515
{
1616
}

include/nbl/system/CStdoutLogger.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace nbl::system
1010
class CStdoutLogger : public IThreadsafeLogger
1111
{
1212
public:
13-
CStdoutLogger(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
13+
CStdoutLogger(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::DefaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
1414

1515
protected:
1616
virtual void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override

include/nbl/system/CStdoutLoggerAndroid.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ namespace nbl::system
1010
class CStdoutLoggerAndroid : public IThreadsafeLogger
1111
{
1212
public:
13-
CStdoutLoggerAndroid(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
13+
CStdoutLoggerAndroid(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::DefaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
1414

1515
private:
1616
void threadsafeLog_impl(const std::string_view& fmt, E_LOG_LEVEL logLevel, va_list args) override;

include/nbl/system/IApplicationFramework.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ class IApplicationFramework : public core::IReferenceCounted
9494

9595
// Some platforms are weird, and you can't really do anything with the system unless you have some magical object that gets passed to the platform's entry point.
9696
// Therefore the specific `CPLATFORMSystem` is uncreatable out of thin air so you need to take an outside provided one
97-
virtual bool onAppInitialized(core::smart_refctd_ptr<ISystem>&& system=nullptr) {onAppInitialized_impl(std::move(system)); return true;}
97+
virtual bool onAppInitialized(core::smart_refctd_ptr<ISystem>&& system=nullptr) {setSystem(std::move(system)); onAppInitialized_impl(); return true;}
9898
virtual bool onAppTerminated() {return true;}
9999

100100
virtual void workLoopBody() = 0;
@@ -104,7 +104,7 @@ class IApplicationFramework : public core::IReferenceCounted
104104
~IApplicationFramework() {}
105105

106106
// DEPRECATED
107-
virtual void onAppInitialized_impl(core::smart_refctd_ptr<ISystem>&& system) {assert(false);}
107+
virtual void onAppInitialized_impl() {assert(false);}
108108
virtual void onAppTerminated_impl() {assert(false);}
109109

110110
// for platforms with cmdline args

include/nbl/system/ILogger.h

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,8 @@ class ILogger : public core::IReferenceCounted
2828
ELL_INFO = 2,
2929
ELL_WARNING = 4,
3030
ELL_PERFORMANCE = 8,
31-
ELL_ERROR = 16
31+
ELL_ERROR = 16,
32+
ELL_ALL = 31
3233
};
3334

3435
inline void log(const std::string_view& fmtString, E_LOG_LEVEL logLevel = ELL_DEBUG, ...)
@@ -47,8 +48,9 @@ class ILogger : public core::IReferenceCounted
4748
return m_logLevelMask;
4849
}
4950

51+
NBL_API2 static core::bitflag<E_LOG_LEVEL> DefaultLogMask();
52+
5053
protected:
51-
NBL_API2 static core::bitflag<E_LOG_LEVEL> defaultLogMask();
5254

5355
ILogger(core::bitflag<E_LOG_LEVEL> logLevelMask) : m_logLevelMask(logLevelMask) {}
5456

include/nbl/video/declarations.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "nbl/video/utilities/CSubpassKiln.h"
3737
#include "nbl/video/utilities/IUtilities.h"
3838
#include "nbl/video/utilities/IGPUObjectFromAssetConverter.h"
39+
#include "nbl/video/utilities/SPhysicalDeviceFilter.h"
3940

4041
//VT
4142
//#include "nbl/video/CGPUMeshPackerV2.h"

include/nbl/video/utilities/SPhysicalDeviceFilter.h

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,18 @@ namespace nbl::video
4747
SurfaceCompatibility* requiredSurfaceCompatibilities = nullptr;
4848
uint32_t requiredSurfaceCompatibilitiesCount = 0u;
4949

50+
51+
// sift through multiple devices
52+
core::set<const IPhysicalDevice*> operator()(core::SRange<const IPhysicalDevice* const> physicalDevices) const
53+
{
54+
core::set<const IPhysicalDevice*> ret;
55+
for (auto& physDev : physicalDevices)
56+
if (meetsRequirements(physDev))
57+
ret.insert(physDev);
58+
return ret;
59+
}
60+
61+
// check one device
5062
bool meetsRequirements(const IPhysicalDevice * const physicalDevice) const
5163
{
5264
const auto& properties = physicalDevice->getProperties();

0 commit comments

Comments
 (0)