Gpgpuimgui

.gitmodules

@@ -102,3 +102,6 @@
 [submodule "3rdparty/imguizmo"]
  path = 3rdparty/imguizmo
  url = [email protected]:Devsh-Graphics-Programming/ImGuizmo.git
+[submodule "3rdparty/imgui_test_engine"]
+ path = 3rdparty/imgui_test_engine
+ url = [email protected]:ocornut/imgui_test_engine.git

3rdparty/CMakeLists.txt

@@ -276,48 +276,116 @@ add_library(spirv_cross OBJECT
 target_compile_definitions(spirv_cross PUBLIC SPIRV_CROSS_EXCEPTIONS_TO_ASSERTIONS)
 
 if(NBL_BUILD_IMGUI)
+ set(NBL_IMGUI_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/imgui")
+ set(NBL_IMGUI_USER_CONFIG_ISD "${CMAKE_CURRENT_BINARY_DIR}/imgui/config/include")
+ set(NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT "${THIRD_PARTY_SOURCE_DIR}/imgui_test_engine")
+ set(NBL_IMGUI_TEST_ENGINE_ROOT "${NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT}/imgui_test_engine")
+ set(NBL_IMGUI_TEST_SUITE_ROOT "${NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT}/imgui_test_suite")
+ set(NBL_IMPLOT_ROOT "${NBL_IMGUI_TEST_SUITE_ROOT}/thirdparty/implot")
+
  add_library(imgui STATIC
- "imgui/imconfig.h"
- "imgui/imgui_demo.cpp"
- "imgui/imgui_draw.cpp"
- "imgui/imgui_internal.h"
- "imgui/imgui_tables.cpp"
- "imgui/imgui_widgets.cpp"
- "imgui/imgui.cpp"
- "imgui/imgui.h"
- "imgui/misc/cpp/imgui_stdlib.cpp"
- "imgui/misc/cpp/imgui_stdlib.h"
- "imgui/imstb_rectpack.h"
- "imgui/imstb_textedit.h"
- "imgui/imstb_truetype.h"
+ "${NBL_IMGUI_ROOT}/imconfig.h"
+ "${NBL_IMGUI_ROOT}/imgui_demo.cpp"
+ "${NBL_IMGUI_ROOT}/imgui_draw.cpp"
+ "${NBL_IMGUI_ROOT}/imgui_internal.h"
+ "${NBL_IMGUI_ROOT}/imgui_tables.cpp"
+ "${NBL_IMGUI_ROOT}/imgui_widgets.cpp"
+ "${NBL_IMGUI_ROOT}/imgui.cpp"
+ "${NBL_IMGUI_ROOT}/misc/freetype/imgui_freetype.cpp"
+ "${NBL_IMGUI_ROOT}/imgui.h"
+ "${NBL_IMGUI_ROOT}/misc/cpp/imgui_stdlib.cpp"
+ "${NBL_IMGUI_ROOT}/misc/cpp/imgui_stdlib.h"
+ "${NBL_IMGUI_ROOT}/imstb_rectpack.h"
+ "${NBL_IMGUI_ROOT}/imstb_textedit.h"
+ "${NBL_IMGUI_ROOT}/imstb_truetype.h"
  )
- target_include_directories(imgui
- PUBLIC "imgui"
- PUBLIC "imgui/misc/cpp"
- PUBLIC "imgui/backends"
+
+ target_link_libraries(imgui PUBLIC freetype)
+
+ target_include_directories(imgui PUBLIC 
+ "${NBL_IMGUI_ROOT}"
+ "${NBL_IMGUI_ROOT}/misc/cpp"
+ "${NBL_IMGUI_ROOT}/backends"
+ "${NBL_IMGUI_TEST_SUITE_ROOT}"
+ $<TARGET_PROPERTY:freetype,INCLUDE_DIRECTORIES>
  )
 
- # ImPlot
  add_library(implot STATIC
- "implot/implot.h"
- "implot/implot_internal.h"
- "implot/implot.cpp"
- "implot/implot_items.cpp"
+ "${NBL_IMPLOT_ROOT}/implot.h"
+ "${NBL_IMPLOT_ROOT}/implot_internal.h"
+ "${NBL_IMPLOT_ROOT}/implot.cpp"
+ "${NBL_IMPLOT_ROOT}/implot_items.cpp"
+ "${NBL_IMPLOT_ROOT}/implot_demo.cpp"
  )
+
  target_include_directories(implot
- PUBLIC "imgui"
+ PUBLIC $<TARGET_PROPERTY:imgui,INCLUDE_DIRECTORIES>
+ PUBLIC "${NBL_IMPLOT_ROOT}"
  )
+
  target_link_libraries(implot PUBLIC imgui)
  target_compile_definitions(implot PUBLIC IMPLOT_DEBUG IMPLOT_DLL_EXPORT)
- set_property(TARGET implot PROPERTY CXX_STANDARD 11)
+ set_target_properties(implot PROPERTIES CXX_STANDARD 20)
+
  if(MSVC)
  target_compile_options(implot PRIVATE /MT /W4 /WX /arch:AVX2 /fp:fast /permissive-) 
  else()
  target_compile_options(implot PRIVATE -Wall -Wextra -pedantic -Werror -mavx2 -Ofast)
  endif()
+
+ file(GLOB_RECURSE NBL_TEST_SUITE_SOURCES CONFIGURE_DEPENDS "${NBL_IMGUI_TEST_SUITE_ROOT}/imgui_test*.cpp")
+ file(GLOB_RECURSE NBL_TEST_SUITE_SOURCES CONFIGURE_DEPENDS "${NBL_IMGUI_TEST_SUITE_ROOT}/imgui_test*.cpp")
+
+ add_library(imtestsuite STATIC
+ ${NBL_TEST_SUITE_SOURCES}
+ )
+
+ target_include_directories(imtestsuite PUBLIC
+ "${NBL_IMGUI_TEST_ENGINE_PROJECT_ROOT}"
+ "${NBL_IMGUI_TEST_ENGINE_ROOT}"
+ "${NBL_IMGUI_TEST_SUITE_ROOT}"
+ $<TARGET_PROPERTY:imgui,INCLUDE_DIRECTORIES>
+ $<TARGET_PROPERTY:implot,INCLUDE_DIRECTORIES>
+ )
+
+ set_target_properties(imtestsuite PROPERTIES CXX_STANDARD 14) # NOTE! THOSE TESTS DO NOT COMPILE WITH HIGHER STANDARDS SO WE WRAP SOURCES INTO LIBRARY COMPILED WITH LOWER ONE
+ target_link_libraries(imtestsuite PUBLIC implot)
+
+ file(GLOB_RECURSE NBL_TEST_ENGINE_SOURCES CONFIGURE_DEPENDS "${NBL_IMGUI_TEST_ENGINE_ROOT}/*.cpp")
+
+ add_library(imtestengine STATIC
+ ${NBL_TEST_ENGINE_SOURCES}
+ )
+
+ target_include_directories(imtestengine PUBLIC
+ $<TARGET_PROPERTY:imtestsuite,INCLUDE_DIRECTORIES>
+ )
+
+ target_link_libraries(imtestengine PUBLIC imtestsuite)
 
  set(IMGUIZMO_BUILD_EXAMPLE OFF)
  add_subdirectory(imguizmo EXCLUDE_FROM_ALL)
+
+ # override test engine config with our own
+string(APPEND NBL_IMPL_IMCONFIG_CONTENT
+[=[
+#include "imgui_test_suite_imconfig.h" // use test engine's config
+
+// note we override it with default imguis (void*) type
+#include <cstdint>
+#define ImTextureID uint32_t
+#define IMGUI_ENABLE_FREETYPE
+#define IMGUI_DISABLE_OBSOLETE_KEYIO
+#undef IMGUI_DISABLE_OBSOLETE_FUNCTIONS // but remove this cuz it break things
+]=]
+)
+ set(NBL_IMGUI_USER_CONFIG_FILEPATH "${NBL_IMGUI_USER_CONFIG_ISD}/nabla_imconfig.h")
+ file(WRITE "${NBL_IMGUI_USER_CONFIG_FILEPATH}" "${NBL_IMPL_IMCONFIG_CONTENT}")
+
+ # USER DEFINED IMGUI CONFIG, IMPACTS THE BUILD
+ target_compile_definitions(imgui PUBLIC
+ IMGUI_USER_CONFIG="${NBL_IMGUI_USER_CONFIG_FILEPATH}"
+ )
 endif()
 
 add_library(aesGladman OBJECT
@@ -412,7 +480,7 @@ if (NBL_BUILD_MITSUBA_LOADER)
  list(APPEND NBL_3RDPARTY_TARGETS expat)
 endif()
 if (NBL_BUILD_IMGUI)
- list(APPEND NBL_3RDPARTY_TARGETS imgui implot imguizmo)
+ list(APPEND NBL_3RDPARTY_TARGETS imgui implot imtestsuite imtestengine imguizmo)
 endif()
 if(ENABLE_HLSL)
  list(APPEND NBL_3RDPARTY_TARGETS HLSL)

cmake/common.cmake

@@ -258,6 +258,7 @@ macro(nbl_create_executable_project _EXTRA_SOURCES _EXTRA_OPTIONS _EXTRA_INCLUDE
  nbl_project_process_test_module()
 endmacro()
 
+# TODO this macro needs more love
 macro(nbl_create_ext_library_project EXT_NAME LIB_HEADERS LIB_SOURCES LIB_INCLUDES LIB_OPTIONS DEF_OPTIONS)
  set(LIB_NAME "NblExt${EXT_NAME}")
  project(${LIB_NAME})
@@ -1281,4 +1282,20 @@ endmacro()
 
 macro(write_source_definitions NBL_FILE NBL_WRAPPER_CODE_TO_WRITE)
  file(WRITE "${NBL_FILE}" "${NBL_WRAPPER_CODE_TO_WRITE}")
+endmacro()
+
+function(NBL_GET_ALL_TARGETS NBL_OUTPUT_VAR)
+ set(NBL_TARGETS)
+ NBL_GET_ALL_TARGETS_RECURSIVE(NBL_TARGETS ${CMAKE_CURRENT_SOURCE_DIR})
+ set(${NBL_OUTPUT_VAR} ${NBL_TARGETS} PARENT_SCOPE)
+endfunction()
+
+macro(NBL_GET_ALL_TARGETS_RECURSIVE NBL_TARGETS NBL_DIRECTORY)
+ get_property(NBL_SUBDIRECTORIES DIRECTORY ${NBL_DIRECTORY} PROPERTY SUBDIRECTORIES)
+ foreach(NBL_SUBDIRECTORY ${NBL_SUBDIRECTORIES})
+ NBL_GET_ALL_TARGETS_RECURSIVE(${NBL_TARGETS} ${NBL_SUBDIRECTORY})
+ endforeach()
+
+ get_property(NBL_GATHERED_TARGETS DIRECTORY ${NBL_DIRECTORY} PROPERTY BUILDSYSTEM_TARGETS)
+ list(APPEND ${NBL_TARGETS} ${NBL_GATHERED_TARGETS})
 endmacro()

include/nbl/asset/ICPUDescriptorSetLayout.h

@@ -24,7 +24,8 @@ class ICPUDescriptorSetLayout : public IDescriptorSetLayout<ICPUSampler>, public
  public:
  _NBL_STATIC_INLINE_CONSTEXPR uint32_t IMMUTABLE_SAMPLER_HIERARCHYLEVELS_BELOW = 1u;
 
- ICPUDescriptorSetLayout(const SBinding* const _begin, const SBinding* const _end) : base_t({_begin,_end}) {}
+ [[deprecated("Use contructor with std::span!")]] ICPUDescriptorSetLayout(const SBinding* const _begin, const SBinding* const _end) : base_t({_begin,_end}) {}
+ ICPUDescriptorSetLayout(const std::span<const SBinding> bindings) : base_t(bindings) {}
 
  core::smart_refctd_ptr<IAsset> clone(uint32_t _depth = ~0u) const override
  {

include/nbl/asset/ICPURenderpass.h

@@ -1,11 +1,9 @@
 #ifndef _NBL_I_CPU_RENDERPASS_H_INCLUDED_
 #define _NBL_I_CPU_RENDERPASS_H_INCLUDED_
 
-
 #include "nbl/asset/IAsset.h"
 #include "nbl/asset/IRenderpass.h"
 
-
 namespace nbl::asset
 {
 
@@ -17,7 +15,8 @@ class ICPURenderpass : public IRenderpass, public IAsset
  const SCreationParamValidationResult validation = validateCreationParams(_params);
  if (!validation)
  return nullptr;
- return core::smart_refctd_ptr<ICPURenderpass>(new ICPURenderpass(_params,validation), core::dont_grab);
+
+ return core::smart_refctd_ptr<ICPURenderpass>(new ICPURenderpass(_params, validation), core::dont_grab);
  }
 
  inline core::smart_refctd_ptr<IAsset> clone(uint32_t _depth = ~0u) const override
@@ -42,7 +41,7 @@ class ICPURenderpass : public IRenderpass, public IAsset
  inline size_t getDependantCount() const override {return 0ull;}
 
  protected:
- using IRenderpass::IRenderpass;
+ inline ICPURenderpass(const SCreationParams& _params, const SCreationParamValidationResult& _validation) : IRenderpass(_params, _validation) {}
  inline ~ICPURenderpass() = default;
 
  inline IAsset* getDependant_impl(const size_t ix) override {return nullptr;}

include/nbl/asset/IRenderpass.h

@@ -11,7 +11,7 @@
 namespace nbl::asset
 {
 
-class IRenderpass
+class NBL_API2 IRenderpass
 {
  public:
  enum class LOAD_OP : uint8_t
@@ -356,6 +356,7 @@ class IRenderpass
 
  protected:
  IRenderpass(const SCreationParams& params, const SCreationParamValidationResult& counts);
+
  virtual ~IRenderpass() {}
 
  SCreationParams m_params;

include/nbl/builtin/hlsl/glsl_compat/core.hlsl

@@ -123,12 +123,23 @@ enable_if_t<is_spirv_type_v<Ptr_T>, T> atomicCompSwap(Ptr_T ptr, T comparator, T
 /**
  * GLSL extended math
  */
+
+ // COMMENTING OUT BECAUSE OF https://github.com/microsoft/DirectXShaderCompiler/issues/6751, bring back when fixed!
+ /*
+
+
 template<typename SquareMatrix> // NBL_REQUIRES() extents are square
 SquareMatrix inverse(NBL_CONST_REF_ARG(SquareMatrix) mat)
 {
  return spirv::matrixInverse(mat);
 }
 
+float32_t2 unpackSnorm2x16(uint32_t p)
+{
+ return spirv::unpackSnorm2x16(p);
+}
+
+*/
 
 /**
  * For Vertex Shaders

include/nbl/builtin/hlsl/spirv_intrinsics/core.hlsl

@@ -189,10 +189,14 @@ template<typename T, typename P>
 enable_if_t<is_spirv_type_v<P>,void> store(P pointer, T obj);
 
 //! Std 450 Extended set operations
+
 template<typename SquareMatrix>
-[[vk::ext_instruction(GLSLstd450MatrixInverse)]]
+[[vk::ext_instruction(GLSLstd450MatrixInverse, "GLSL.std.450")]]
 SquareMatrix matrixInverse(NBL_CONST_REF_ARG(SquareMatrix) mat);
 
+[[vk::ext_instruction(GLSLstd450UnpackSnorm2x16, "GLSL.std.450")]]
+float32_t2 unpackSnorm2x16(uint32_t p);
+
 // Memory Semantics link here: https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#Memory_Semantics_-id-
 
 // https://registry.khronos.org/SPIR-V/specs/unified1/SPIRV.html#_memory_semantics_id