Skip to content

Fix ImGui shutdown and update EX31 runtime fixes #1037

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AnastaZIuk wants to merge 7 commits into
base: path_tracer_beauty
Choose a base branch
from
Open

Fix ImGui shutdown and update EX31 runtime fixes #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ea88203
Update examples_tests for EX31 fixes
AnastaZIuk Mar 31, 2026
e9af71f
Fix ImGui shutdown and update EX31 RWMC path
AnastaZIuk Mar 31, 2026
be8b0cd
Update examples_tests for EX31 RWMC defaults
AnastaZIuk Mar 31, 2026
eb1bc72
Update DXC for lexed inline method assert fix
AnastaZIuk Apr 1, 2026
f16e497
Promote NSC channel eb1bc723b1159029c572f5bf539dafeea03bbbcc
github-actions[bot] Apr 1, 2026
9e7e72d
Merge pull request #1039 from Devsh-Graphics-Programming/fix_ex40_dxc…
AnastaZIuk Apr 1, 2026
292d751
Merge master into unroll-path_tracer_beauty
AnastaZIuk Apr 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion 3rdparty/dxc/dxc
Open in desktop
Submodule dxc updated 3 files
+1 −1 external/SPIRV-Tools
+1 −0 tools/clang/lib/Parse/ParseCXXInlineMethods.cpp
+15 −0 tools/clang/test/CodeGenSPIRV/ex40-lexed-inline-method-odr-use-crash.hlsl
2 changes: 1 addition & 1 deletion examples_tests
Open in desktop
Submodule examples_tests updated 10 files
+5 −8 31_HLSLPathTracer/CMakeLists.txt
+1 −1 31_HLSLPathTracer/app_resources/hlsl/compute_render_scene_impl.hlsl
+2 −16 31_HLSLPathTracer/app_resources/hlsl/render_common.hlsl
+0 −1 31_HLSLPathTracer/app_resources/hlsl/spirv/pt.compute.rectangle.rwmc.linear.proxy.hlsl
+0 −1 31_HLSLPathTracer/app_resources/hlsl/spirv/pt.compute.triangle.linear.proxy.hlsl
+0 −1 31_HLSLPathTracer/app_resources/hlsl/spirv/pt.compute.triangle.rwmc.linear.proxy.hlsl
+4 −21 31_HLSLPathTracer/app_resources/hlsl/spirv/pt.compute.variant.shared.hlsl
+14 −5 31_HLSLPathTracer/include/nbl/this_example/render_variant_info.hpp
+385 −82 31_HLSLPathTracer/main.cpp
+0 −2 31_HLSLPathTracer/pt.variant_ids.cmake
13 changes: 10 additions & 3 deletions src/nbl/ext/ImGui/ImGui.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#include "nbl/ext/ImGui/ImGui.h"
#include "nbl/ext/ImGui/builtin/hlsl/common.hlsl"
#include "imgui/imgui.h"
#include "imgui/imgui_internal.h"
#include "imgui/misc/cpp/imgui_stdlib.h"

#ifdef NBL_EMBED_BUILTIN_RESOURCES
Expand Down Expand Up @@ -948,14 +949,20 @@ UI::UI(SCreationParameters&& creationParams, core::smart_refctd_ptr<video::IGPUG
UI::~UI()
{
// I assume somebody has not killed ImGUI context & atlas but if so then we do nothing
auto* const context = reinterpret_cast<ImGuiContext*>(m_imContextBackPointer);
ImGuiContext* const previousContext = ImGui::GetCurrentContext();
if (context && previousContext != context)
ImGui::SetCurrentContext(context);

// we must call it to unlock atlas from potential "render" state before we kill it (obvsly if its ours!)
if(m_imFontAtlasBackPointer)
if (m_imFontAtlasBackPointer && context && context->WithinFrameScope)
ImGui::EndFrame();

// context belongs to the instance, we must free it
if(m_imContextBackPointer)
ImGui::DestroyContext(reinterpret_cast<ImGuiContext*>(m_imContextBackPointer));
if (context)
ImGui::DestroyContext(context);
if (previousContext && previousContext != context)
ImGui::SetCurrentContext(previousContext);

// and if we own the atlas we must free it as well, if user passed its own at creation time then its "shared" - at this point m_imFontAtlasBackPointer is nullptr and we don't free anything
if (m_imFontAtlasBackPointer)
Expand Down
2 changes: 1 addition & 1 deletion tools/nsc/manifests/nsc-windows-x64-release.tag
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nsc-windows-x64-release-29bda527be490f8214e937ae33bbffd438cce6e6
nsc-windows-x64-release-eb1bc723b1159029c572f5bf539dafeea03bbbcc
4 changes: 2 additions & 2 deletions tools/nsc/manifests/nsc-windows-x64-release/exe/tools/nsc/bin/build-info.json.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
outs:
- md5: f739d206ca9055781c891f130c6ebc1b
size: 1311
- md5: 27b41f54ba2fbed4e8a0c507e3efb152
size: 1337
hash: md5
path: build-info.json
2 changes: 1 addition & 1 deletion tools/nsc/manifests/nsc-windows-x64-release/exe/tools/nsc/bin/nsc.exe.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
outs:
- md5: c4bb7179384f8fe59a5706751a2ef473
- md5: 2f6ac2e50fe11b36b5a426bcb3b3fa3a
size: 258048
hash: md5
path: nsc.exe
4 changes: 2 additions & 2 deletions tools/nsc/manifests/nsc-windows-x64-release/runtime/nbl/3rdparty/dxc/dxcompiler.dll.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
outs:
- md5: 862b11b94cb23c8bac2a20a215eb6597
size: 21601280
- md5: 2f88a872e7e2c9b1c07683f265559b05
size: 21609472
hash: md5
path: dxcompiler.dll
4 changes: 2 additions & 2 deletions tools/nsc/manifests/nsc-windows-x64-release/runtime/nbl/Nabla.dll.dvc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
outs:
- md5: 5edb2790e9ceae424e3c0a04e3d84718
size: 29212672
- md5: f3efa28ec945dae71bf6bbe34331d8ca
size: 29222400
hash: md5
path: Nabla.dll
Loading