Merge pull request #948 from Devsh-Graphics-Programming/vkinfoUpdates

Vkinfo updates

Author: AnastaZIuk

3rdparty/CMakeLists.txt

@@ -543,9 +543,6 @@ nbl_install_dir(imath/src/Imath)
 
 nbl_install_file(blake/c/blake3.h)
 
-nbl_install_file_spec(nlohmann_json/include/nlohmann/json_fwd.hpp nlohmann)
-nbl_install_file_spec(nlohmann_json/include/nlohmann/detail/abi_macros.hpp nlohmann/detail)
-
 nbl_install_dir(boost/superproject/libs/preprocessor/include/boost)
 
 nbl_install_file_spec(renderdoc/renderdoc_app.h renderdoc)

3rdparty/Vulkan-Headers

@@ -12,9 +12,7 @@
 
 #include "nbl/asset/IShader.h"
 #include "nbl/asset/utils/ISPIRVOptimizer.h"
-
-// Less leakage than "nlohmann/json.hpp" only forward declarations
-#include "nlohmann/json_fwd.hpp"
+#include "nbl/system/json.h"
 
 #include "nbl/builtin/hlsl/enums.hlsl"
 
@@ -111,11 +109,10 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 		//
 		struct SMacroDefinition
 		{
-			friend void to_json(nlohmann::json&, const SMacroDefinition&);
-			friend void from_json(const nlohmann::json&, SMacroDefinition&);
-
 			std::string_view identifier;
 			std::string_view definition;
+
+			friend struct system::json::adl_serializer<SMacroDefinition>;
 		};
 
 		//
@@ -216,9 +213,8 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 							inline SPreprocessingDependency() {}
 
 						private:
-							friend void to_json(nlohmann::json& j, const SEntry::SPreprocessingDependency& dependency);
-							friend void from_json(const nlohmann::json& j, SEntry::SPreprocessingDependency& dependency);
 							friend class CCache;
+							friend struct system::json::adl_serializer<SEntry::SPreprocessingDependency>;
 
 							// path or identifier
 							system::path requestingSourceDir = "";
@@ -252,8 +248,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 							friend class SCompilerArgs;
 							friend class SEntry;
 							friend class CCache;
-							friend void to_json(nlohmann::json&, const SPreprocessorArgs&);
-							friend void from_json(const nlohmann::json&, SPreprocessorArgs&);
+							friend struct system::json::adl_serializer<SPreprocessorArgs>;
 
 							// Default constructor needed for json serialization of SCompilerArgs
 							SPreprocessorArgs() {};
@@ -295,8 +290,7 @@ class NBL_API2 IShaderCompiler : public core::IReferenceCounted
 						private:
 							friend class SEntry;
 							friend class CCache;
-							friend void to_json(nlohmann::json&, const SCompilerArgs&);
-							friend void from_json(const nlohmann::json&, SCompilerArgs&);
+							friend struct system::json::adl_serializer<SCompilerArgs>;
 
 							// Default constructor needed for json serialization of SEntry
 							SCompilerArgs() {}

3rdparty/Vulkan-Tools

@@ -0,0 +1,15 @@
+#ifndef _NBL_SYSTEM_JSON_H_INCLUDED_
+#define _NBL_SYSTEM_JSON_H_INCLUDED_
+
+namespace nbl::system::json {
+    template<typename T, typename SFINAE = void> struct adl_serializer;
+}
+
+#define NBL_JSON_IMPL_BIND_ADL_SERIALIZER(T)        \
+namespace nlohmann {                                \
+    template<>                                      \
+    struct adl_serializer<typename T::value_t>      \
+        : T {};                                     \
+}
+
+#endif // _NBL_SYSTEM_JSON_H_INCLUDED_

examples_tests

@@ -28,6 +28,7 @@ find_package(Nabla REQUIRED CONFIG
 
 add_executable(smoke main.cpp pch.hpp cdb.ps1)
 target_link_libraries(smoke PRIVATE Nabla::Nabla)
+target_compile_definitions(smoke PRIVATE _AFXDLL)
 target_precompile_headers(smoke PRIVATE pch.hpp)
 
 set(CMAKE_CTEST_ARGUMENTS --verbose)

include/nbl/asset/utils/IShaderCompiler.h

@@ -1,3 +1,5 @@
+#include <afxwin.h>
+
 #define ENABLE_SMOKE
 
 using namespace nbl;
@@ -36,45 +38,86 @@ class Smoke final : public system::IApplicationFramework
             return false;
         }
 
-        exportGpuProfiles();
+        if (!AfxWinInit(GetModuleHandle(nullptr), nullptr, GetCommandLineA(), 0))
+        {
+            std::cerr << "[ERROR]: Could not init AFX, terminating!\n";
+            return false;
+        }
+
+        try {
+            createAfxDummyWindow(320, 240, nullptr, _T("Dummy 1"));
+            exportGpuProfiles();
+            createAfxDummyWindow(320, 240, nullptr, _T("Dummy 2"));
+        }
+        catch (const std::exception& e) { 
+            std::cerr << "[ERROR]: " << e.what() << '\n';
+            return false;
+        }
+        catch (...) {
+            std::cerr << "[ERROR]: Unknown exception!\n";
+            return false;
+        }
 
         return true;
     }
 
     void workLoopBody() override {}
     bool keepRunning() override { return false; }
 
+    bool onAppTerminated() override
+    {
+        AfxWinTerm();
+        return true;
+    }
+
 private:
     static void exportGpuProfiles()
     {
-        std::string arg2 = "-o";
-        std::string buf;
-        std::string arg1;
-        std::string arg3;
+        std::string buf, arg1, arg2 = "-o", arg3;
 
         for (size_t i = 0;; i++)
         {
-            auto stringifiedIndex = std::to_string(i);
-            arg1 = "--json=" + stringifiedIndex;
-            arg3 = "device_" + stringifiedIndex + ".json";
-            std::array<const char*, 3> args = { arg1.data(), arg2.data(), arg3.data() };
+            auto six = std::to_string(i);
+            arg1 = "--json=" + six;
+            arg3 = "device_" + six + ".json";
 
+            auto args = std::to_array<const char*>({ arg1.data(), arg2.data(), arg3.data()});
             int code = nbl::video::vulkaninfo(args);
 
             if (code != 0)
                 break;
 
-            // print out file content
             std::ifstream input(arg3);
 
             while (std::getline(input, buf))
-            {
                 std::cout << buf << "\n";
-            }
 
             std::cout << "\n\n";
         }
     }
+
+    static bool createAfxDummyWindow(int w, int h, HWND parent, LPCTSTR windowName)
+    {
+        CWnd wnd;
+        LPCTSTR cls = AfxRegisterWndClass(0, ::LoadCursor(nullptr, IDC_ARROW));
+        if (!cls) return false;
+
+        if (!wnd.CreateEx(0, cls, windowName, WS_POPUP | WS_VISIBLE, 0, 0, w, h, parent, nullptr))
+            return false;
+
+        MSG msg {};
+        const ULONGLONG end = GetTickCount64() + 1000;
+        while (GetTickCount64() < end) {
+            while (PeekMessage(&msg, nullptr, 0, 0, PM_REMOVE)) {
+                TranslateMessage(&msg);
+                DispatchMessage(&msg);
+            }
+            Sleep(1);
+        }
+
+        wnd.DestroyWindow();
+        return true;
+    }
 };
 
 NBL_MAIN_FUNC(Smoke)