Gpgpuimgui

.gitmodules

@@ -99,3 +99,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

@@ -274,19 +274,24 @@ if(NBL_BUILD_IMGUI)
  PUBLIC "imgui/backends"
  )
 
- # ImPlot
+ set(NBL_IMGUI_TEST_ENGINE_ROOT "${CMAKE_CURRENT_SOURCE_DIR}/imgui_test_engine/imgui_test_suite")
+ set(NBL_IMPLOT_ROOT "${NBL_IMGUI_TEST_ENGINE_ROOT}/thirdparty/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 imgui
+ 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_property(TARGET implot PROPERTY CXX_STANDARD 20)
  if(MSVC)
  target_compile_options(implot PRIVATE /MT /W4 /WX /arch:AVX2 /fp:fast /permissive-) 
  else()

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

@@ -107,12 +107,23 @@ enable_if_t<is_spirv_type_v<Ptr_T>, T> atomicCompSwap(Ptr_T ptr, T value)
 /**
  * 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

@@ -175,10 +175,19 @@ template<typename T, typename P, uint32_t alignment >
 enable_if_t<is_spirv_type_v<P>, void> store(P pointer, T obj, [[vk::ext_literal]] uint32_t __aligned = /*Aligned*/0x00000002, [[vk::ext_literal]] uint32_t __alignment = alignment);
 
 //! Std 450 Extended set operations
+
+// COMMENTING OUT BECAUSE OF https://github.com/microsoft/DirectXShaderCompiler/issues/6751, bring back when fixed!
+/*
+
 template<typename SquareMatrix>
 [[vk::ext_instruction(GLSLstd450MatrixInverse)]]
 SquareMatrix matrixInverse(NBL_CONST_REF_ARG(SquareMatrix) mat);
 
+[[vk::ext_instruction(GLSLstd450UnpackSnorm2x16)]]
+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

include/nbl/ext/ImGui/ImGui.h

@@ -3,68 +3,47 @@
 
 namespace nbl::ext::imgui
 {
+
 class UI final : public core::IReferenceCounted
 {
  public:
- UI(core::smart_refctd_ptr<video::ILogicalDevice> device, int maxFramesInFlight, video::IGPURenderpass* renderpass, video::IGPUPipelineCache* pipelineCache, core::smart_refctd_ptr<ui::IWindow> window);
+ UI(core::smart_refctd_ptr<video::ILogicalDevice> device, uint32_t _maxFramesInFlight, video::IGPURenderpass* renderpass, video::IGPUPipelineCache* pipelineCache, core::smart_refctd_ptr<ui::IWindow> window);
  ~UI() override;
 
- bool Render(nbl::video::IGPUCommandBuffer* commandBuffer, int frameIndex);
- void Update(float deltaTimeInSec, float mousePosX, float mousePosY, size_t mouseEventsCount, ui::SMouseEvent const * mouseEvents); // TODO: Keyboard events
- void BeginWindow(char const* windowName);
- void EndWindow();
- int Register(std::function<void()> const& listener);
- bool UnRegister(int listenerId);
- void SetNextItemWidth(float nextItemWidth);
- void SetWindowSize(float width, float height);
- void Text(char const* label, ...);
- void InputFloat(char const* label, float* value);
- void InputFloat2(char const* label, float* value);
- void InputFloat3(char const* label, float* value);
- void InputFloat4(char const* label, float* value);
- void InputFloat3(char const* label, nbl::core::vector3df& value);
- bool Combo(char const* label, int32_t* selectedItemIndex, char const** items, int32_t itemsCount);
- bool Combo(const char* label, int* selectedItemIndex, std::vector<std::string>& values);
- void SliderInt(char const* label, int* value, int minValue, int maxValue);
- void SliderFloat(char const* label, float* value, float minValue, float maxValue);
- void Checkbox(char const* label, bool* value);
- void Spacing();
- void Button(char const* label, std::function<void()> const& onPress);
- void InputText(char const* label, std::string& outValue);
- [[nodiscard]] bool HasFocus(); 
- [[nodiscard]] bool IsItemActive();
- [[nodiscard]] bool TreeNode(char const* name);
- void TreePop();
+ bool render(nbl::video::IGPUCommandBuffer* commandBuffer, const uint32_t frameIndex);
+ void update(float deltaTimeInSec, float mousePosX, float mousePosY, size_t mouseEventsCount, ui::SMouseEvent const * mouseEvents); // TODO: Keyboard events
+ int registerListener(std::function<void()> const& listener);
+ bool unregisterListener(int listenerId);
+
+ void* getContext();
+ void setContext(void* imguiContext);
 
  private:
-
- core::smart_refctd_ptr<video::IGPUDescriptorSetLayout> CreateDescriptorSetLayout();
-
- void CreatePipeline(video::IGPURenderpass* renderpass, video::IGPUPipelineCache* pipelineCache);
- void CreateFontTexture(video::IGPUCommandBuffer* cmdBuffer, video::IQueue* queue);
- void UpdateDescriptorSets();
+ core::smart_refctd_ptr<video::IGPUDescriptorSetLayout> createDescriptorSetLayout();
+ void createPipeline(video::IGPURenderpass* renderpass, video::IGPUPipelineCache* pipelineCache);
+ void createFontTexture(video::IGPUCommandBuffer* cmdBuffer, video::IQueue* queue);
+ void updateDescriptorSets();
  void createSystem();
- void CreateFontSampler();
- void CreateDescriptorPool();
- void HandleMouseEvents(float mousePosX, float mousePosY, size_t mouseEventsCount, ui::SMouseEvent const * mouseEvents) const;
+ void createFontSampler();
+ void createDescriptorPool();
+ void handleMouseEvents(float mousePosX, float mousePosY, size_t mouseEventsCount, ui::SMouseEvent const * mouseEvents) const;
 
  core::smart_refctd_ptr<system::ISystem> system;
  core::smart_refctd_ptr<system::ILogger> logger;
  core::smart_refctd_ptr<video::IUtilities> utilities;
-
  core::smart_refctd_ptr<video::ILogicalDevice> m_device;
  core::smart_refctd_ptr<video::IGPUSampler> m_fontSampler;
  core::smart_refctd_ptr<video::IDescriptorPool> m_descriptorPool;
  core::smart_refctd_ptr<video::IGPUDescriptorSet> m_gpuDescriptorSet;
-
  core::smart_refctd_ptr<video::IGPUGraphicsPipeline> pipeline;
  core::smart_refctd_ptr<video::IGPUImageView> m_fontTexture;
  core::smart_refctd_ptr<ui::IWindow> m_window;
- std::vector<core::smart_refctd_ptr<video::IGPUBuffer>> m_vertexBuffers, m_indexBuffers;
- bool hasFocus = false;
+ std::vector<core::smart_refctd_ptr<video::IGPUBuffer>> m_mdiBuffers;
+ const uint32_t maxFramesInFlight;
 
  // TODO: Use a signal class instead like Signal<> UIRecordSignal{};
- struct Subscriber {
+ struct Subscriber 
+ {
  int id = -1;
  std::function<void()> listener = nullptr;
  };