Skip to content

Fix nite #917

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

Merged
merged 4 commits into from
Aug 28, 2025
Merged

Fix nite #917

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
c76bc89
Fix nite
Aug 27, 2025
1ae9a57
public read access to texturesCount and samplersCount
Aug 27, 2025
17d5a6d
Include nite in CI
Aug 27, 2025
d48cfae
Exclude nite from CI
Aug 28, 2025
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
3 changes: 3 additions & 0 deletions include/nbl/ext/ImGui/ImGui.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ class UI final : public core::IReferenceCounted
//! required, fill the info to instruct the backend about the required UI resources
SBindingInfo texturesInfo, samplersInfo;

uint32_t getTexturesCount() const { return texturesCount; }
uint32_t getSamplersCount() const { return samplersCount; }

private:
uint32_t texturesCount = {}, samplersCount = {};

Expand Down
57 changes: 29 additions & 28 deletions tools/nite/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
#include <nabla.h>
#include "nbl/video/utilities/CSimpleResizeSurface.h"

#include "SimpleWindowedApplication.hpp"
#include "CEventCallback.hpp"
#include "nbl/examples/common/SimpleWindowedApplication.hpp"
#include "nbl/examples/common/CEventCallback.hpp"

#include "nbl/ext/ImGui/ImGui.h"
#include "nbl/ui/ICursorControl.h"
Expand Down Expand Up @@ -39,6 +39,7 @@ class NITETool final : public examples::SimpleWindowedApplication
static_assert(FRAMES_IN_FLIGHT > SC_IMG_COUNT);

constexpr static inline clock_t::duration DisplayImageDuration = std::chrono::milliseconds(900);
constexpr static inline uint8_t MaxUITextureCount = 1u;

public:
inline NITETool(const path& _localInputCWD, const path& _localOutputCWD, const path& _sharedInputCWD, const path& _sharedOutputCWD)
Expand All @@ -49,7 +50,7 @@ class NITETool final : public examples::SimpleWindowedApplication
if (!m_surface)
{
{
auto windowCallback = core::make_smart_refctd_ptr<CEventCallback>(smart_refctd_ptr(m_inputSystem), smart_refctd_ptr(m_logger));
auto windowCallback = core::make_smart_refctd_ptr<examples::CEventCallback>(smart_refctd_ptr(m_inputSystem), smart_refctd_ptr(m_logger));
IWindow::SCreationParams params = {};
params.callback = core::make_smart_refctd_ptr<nbl::video::ISimpleManagedSurface::ICallback>();
params.width = WIN_W;
Expand Down Expand Up @@ -107,7 +108,7 @@ class NITETool final : public examples::SimpleWindowedApplication
const auto pModeArg = program.get<std::string>(NBL_MODE_ARG.data());
const auto pGroupArg = program.get<std::string>(NBL_GROUP_ARG.data());

m_inputSystem = make_smart_refctd_ptr<InputSystem>(logger_opt_smart_ptr(smart_refctd_ptr(m_logger)));
m_inputSystem = make_smart_refctd_ptr<examples::InputSystem>(logger_opt_smart_ptr(smart_refctd_ptr(m_logger)));

if (!device_base_t::onAppInitialized(smart_refctd_ptr(m_system)))
return false;
Expand Down Expand Up @@ -157,7 +158,7 @@ class NITETool final : public examples::SimpleWindowedApplication
if (!m_surface || !m_surface->init(gQueue, std::move(scResources), swapchainParams.sharedParams))
return logFail("Could not create Window & Surface or initialize the Surface!");

m_maxFramesInFlight = m_surface->getMaxFramesInFlight();
m_maxFramesInFlight = m_surface->getMaxAcquiresInFlight();
if (FRAMES_IN_FLIGHT < m_maxFramesInFlight)
{
m_logger->log("Lowering frames in flight!", ILogger::ELL_WARNING);
Expand All @@ -174,26 +175,29 @@ class NITETool final : public examples::SimpleWindowedApplication
return logFail("Couldn't create Command Buffer!");
}

ui.manager = core::make_smart_refctd_ptr<nbl::ext::imgui::UI>
(
nbl::ext::imgui::UI::S_CREATION_PARAMETERS
{
.assetManager = m_assetManager.get(),
.utilities = m_utils.get(),
.transfer = getTransferUpQueue(),
.renderpass = renderpass,
.subpassIx = 0u
}
);
nbl::ext::imgui::UI::SCreationParameters params;

params.resources.texturesInfo = { .setIx = 0u, .bindingIx = 0u };
params.resources.samplersInfo = { .setIx = 0u, .bindingIx = 1u };
params.assetManager = m_assetManager;
params.pipelineCache = nullptr;
params.pipelineLayout = nbl::ext::imgui::UI::createDefaultPipelineLayout(m_utils->getLogicalDevice(), params.resources.texturesInfo, params.resources.samplersInfo, MaxUITextureCount);
params.renderpass = smart_refctd_ptr<IGPURenderpass>(renderpass);
params.streamingBuffer = nullptr;
params.subpassIx = 0u;
params.transfer = getTransferUpQueue();
params.utilities = m_utils;

ui.manager = nbl::ext::imgui::UI::create(std::move(params));

{
// note that we use default layout provided by our extension (textures & samplers -> single set at 0u ix)
const auto* descriptorSetLayout = ui.manager->getPipeline()->getLayout()->getDescriptorSetLayout(0u);
const auto& params = ui.manager->getCreationParameters();

IDescriptorPool::SCreateInfo descriptorPoolInfo = {};
descriptorPoolInfo.maxDescriptorCount[static_cast<uint32_t>(asset::IDescriptor::E_TYPE::ET_SAMPLER)] = params.resources.count;
descriptorPoolInfo.maxDescriptorCount[static_cast<uint32_t>(asset::IDescriptor::E_TYPE::ET_SAMPLED_IMAGE)] = params.resources.count;
descriptorPoolInfo.maxDescriptorCount[static_cast<uint32_t>(asset::IDescriptor::E_TYPE::ET_SAMPLER)] = params.resources.getSamplersCount();
descriptorPoolInfo.maxDescriptorCount[static_cast<uint32_t>(asset::IDescriptor::E_TYPE::ET_SAMPLED_IMAGE)] = params.resources.getTexturesCount();
descriptorPoolInfo.maxSets = 1u;
descriptorPoolInfo.flags = IDescriptorPool::E_CREATE_FLAGS::ECF_UPDATE_AFTER_BIND_BIT;

Expand Down Expand Up @@ -333,7 +337,7 @@ class NITETool final : public examples::SimpleWindowedApplication
const auto uiParams = ui.manager->getCreationParameters();
auto* pipeline = ui.manager->getPipeline();
cb->bindGraphicsPipeline(pipeline);
cb->bindDescriptorSets(EPBP_GRAPHICS, pipeline->getLayout(), uiParams.resources.textures.setIx, 1u, &ui.descriptorSet.get()); // note that we use default UI pipeline layout where uiParams.resources.textures.setIx == uiParams.resources.samplers.setIx
cb->bindDescriptorSets(EPBP_GRAPHICS, pipeline->getLayout(), uiParams.resources.texturesInfo.setIx, 1u, &ui.descriptorSet.get()); // note that we use default UI pipeline layout where uiParams.resources.textures.setIx == uiParams.resources.samplers.setIx
ui.manager->render(cb, waitInfo);
cb->endRenderPass();
}
Expand Down Expand Up @@ -470,15 +474,12 @@ class NITETool final : public examples::SimpleWindowedApplication

const auto cursorPosition = m_window->getCursorControl()->getPosition();

nbl::ext::imgui::UI::S_UPDATE_PARAMETERS params =
nbl::ext::imgui::UI::SUpdateParameters params =
{
.mousePosition = nbl::hlsl::float32_t2(cursorPosition.x, cursorPosition.y) - nbl::hlsl::float32_t2(m_window->getX(), m_window->getY()),
.displaySize = { m_window->getWidth(), m_window->getHeight() },
.events =
{
.mouse = core::SRange<const nbl::ui::SMouseEvent>(capturedEvents.mouse.data(), capturedEvents.mouse.data() + capturedEvents.mouse.size()),
.keyboard = core::SRange<const nbl::ui::SKeyboardEvent>(capturedEvents.keyboard.data(), capturedEvents.keyboard.data() + capturedEvents.keyboard.size())
}
.mouseEvents = core::SRange<const nbl::ui::SMouseEvent>(capturedEvents.mouse.data(), capturedEvents.mouse.data() + capturedEvents.mouse.size()),
.keyboardEvents = core::SRange<const nbl::ui::SKeyboardEvent>(capturedEvents.keyboard.data(), capturedEvents.keyboard.data() + capturedEvents.keyboard.size()),
};

ui.manager->update(params);
Expand All @@ -502,9 +503,9 @@ class NITETool final : public examples::SimpleWindowedApplication
} ui;

smart_refctd_ptr<nbl::asset::IAssetManager> m_assetManager;
core::smart_refctd_ptr<InputSystem> m_inputSystem;
InputSystem::ChannelReader<IMouseEventChannel> mouse;
InputSystem::ChannelReader<IKeyboardEventChannel> keyboard;
core::smart_refctd_ptr<examples::InputSystem> m_inputSystem;
examples::InputSystem::ChannelReader<IMouseEventChannel> mouse;
examples::InputSystem::ChannelReader<IKeyboardEventChannel> keyboard;

// Test engine
ImGuiTestEngine* engine = nullptr;
Expand Down
Loading