Merge remote-tracking branch 'remotes/origin/master' into hlsl-compiler-impl

Author: devshgraphicsprogramming

include/nbl/system/CColoredStdoutLoggerANSI.h

@@ -0,0 +1,49 @@
+#ifndef _NBL_SYSTEM_C_COLORED_STDOUT_LOGGER_ANSI_INCLUDED_
+#define _NBL_SYSTEM_C_COLORED_STDOUT_LOGGER_ANSI_INCLUDED_
+
+#include "nbl/system/IThreadsafeLogger.h"
+
+#include <string_view>
+
+namespace nbl::system
+{
+
+// logging using ANSI escape codes
+class NBL_API2 CColoredStdoutLoggerANSI : public IThreadsafeLogger
+{
+  public:
+    CColoredStdoutLoggerANSI(core::bitflag<E_LOG_LEVEL> logLevelMask = ILogger::defaultLogMask()) : IThreadsafeLogger(logLevelMask) {}
+
+  private:
+    // more info about how this works: https://gist.github.com/fnky/458719343aabd01cfb17a3a4f7296797
+    virtual void threadsafeLog_impl(const std::string_view &fmt, E_LOG_LEVEL logLevel, va_list args) override
+    {
+      auto str = constructLogString(fmt, logLevel, args);
+      switch (logLevel)
+      {
+        case ELL_DEBUG:
+          printf("\x1b[37m%s", str.data()); // White
+          break;
+        case ELL_INFO:
+          printf("\x1b[37m%s", str.data()); // White
+          break;
+        case ELL_WARNING:
+          printf("\x1b[33m%s", str.data()); // yellow
+          break;
+        case ELL_ERROR:
+          printf("\x1b[31m%s", str.data()); // red
+          break;
+        case ELL_PERFORMANCE:
+          printf("\x1b[34m%s", str.data()); // blue
+          break;
+        case ELL_NONE:
+          assert(false);
+          break;
+      }
+      fflush(stdout);
+    }
+};
+
+} // namespace nbl::system
+
+#endif

include/nbl/system/ISystemPOSIX.h

@@ -6,7 +6,7 @@
 namespace nbl::system
 {
 
-#if defined(__unix__)
+#if defined(_NBL_PLATFORM_LINUX_) || defined (_NBL_PLATFORM_ANDROID_)
 class ISystemPOSIX : public ISystem
 {
     protected:

src/nbl/system/CSystemLinux.cpp

@@ -4,14 +4,16 @@ using namespace nbl;
 using namespace nbl::system;
 
 #ifdef _NBL_PLATFORM_LINUX_
+
+#include <sys/sysinfo.h>
 ISystem::SystemInfo CSystemLinux::getSystemInfo() const
 {
     SystemInfo info;
 
     // TODO
-    info.cpuFrequencyHz = 3000000000u;
+    // info.cpuFrequencyHz = 3000000000u;
 
-    sysinfo linuxSystemInfo;
+    struct sysinfo linuxSystemInfo;
     sysinfo(&linuxSystemInfo);
     info.totalMemory = linuxSystemInfo.totalram;
     info.availableMemory = linuxSystemInfo.freeram;

src/nbl/system/ISystemPOSIX.cpp

@@ -1,10 +1,13 @@
 #include "nbl/system/ISystemPOSIX.h"
 #include "nbl/system/CFilePOSIX.h"
 
+#include "nbl/system/IFile.h"
+
 using namespace nbl;
 using namespace nbl::system;
 
-#if defined(__unix__)
+#if defined(_NBL_PLATFORM_LINUX_) || defined (_NBL_PLATFORM_ANDROID_)
+
 #include <fcntl.h>
 #include <sys/mman.h>
 #include <sys/stat.h>
@@ -13,7 +16,7 @@ core::smart_refctd_ptr<ISystemFile> ISystemPOSIX::CCaller::createFile(const std:
 {	
     const bool writeAccess = flags.value&IFile::ECF_WRITE;
 	int createFlags = O_LARGEFILE|(writeAccess ? O_CREAT:0);
-	switch (_flags.value&IFile::ECF_READ_WRITE))
+	switch (flags.value&IFile::ECF_READ_WRITE)
 	{
 		case IFile::ECF_READ:
 			createFlags |= O_RDONLY;
@@ -30,7 +33,7 @@ core::smart_refctd_ptr<ISystemFile> ISystemPOSIX::CCaller::createFile(const std:
 	}
 
 	CFilePOSIX::native_file_handle_t _native = -1;
-	auto filenameStream = _filename.string();
+	auto filenameStream = filename.string();
 	const char* name_c_str = filenameStream.c_str();
 	// only create a new file if we're going to be writing
 	if (writeAccess)
@@ -60,7 +63,7 @@ core::smart_refctd_ptr<ISystemFile> ISystemPOSIX::CCaller::createFile(const std:
 
 	// map if needed
 	void* _mappedPtr = nullptr;
-	if (_flags.value & ECF_MAPPABLE)
+	if (flags.value & IFile::ECF_MAPPABLE)
 	{
 		const int mappingFlags = ((flags.value&IFile::ECF_READ) ? PROT_READ:0)|(writeAccess ? PROT_WRITE:0);
 		_mappedPtr = mmap((caddr_t)0, _size, mappingFlags, MAP_PRIVATE, _native, 0);
@@ -71,6 +74,6 @@ core::smart_refctd_ptr<ISystemFile> ISystemPOSIX::CCaller::createFile(const std:
 		}
 	}
 
-	return core::make_smart_refctd_ptr<CFilePOSIX>(core::smart_refctd_ptr<ISystem>(m_system),filename,flags,_mappedPtr,_size,_native);
+	return core::make_smart_refctd_ptr<CFilePOSIX>(core::smart_refctd_ptr<ISystem>(m_system),path(filename),flags,_mappedPtr,_size,_native);
 }
 #endif