Skip to content

Commit 637c0b5

Browse files
Trying to make vulkan api work
1 parent 6a60f19 commit 637c0b5

File tree

1 file changed

+14
-8
lines changed

1 file changed

+14
-8
lines changed

examples_tests/61.UI/main.cpp

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ class UIApp : public ApplicationBase
8888

8989
const auto swapchainImageUsage = static_cast<asset::IImage::E_USAGE_FLAGS>(asset::IImage::EUF_COLOR_ATTACHMENT_BIT);
9090
const video::ISurface::SFormat surfaceFormat(asset::EF_B8G8R8A8_SRGB, asset::ECP_COUNT, asset::EOTF_UNKNOWN);
91-
CommonAPI::InitWithDefaultExt(initOutput, video::EAT_OPENGL, "glTF", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, asset::EF_D32_SFLOAT);
91+
CommonAPI::InitWithDefaultExt(initOutput, video::EAT_VULKAN, "UI", WIN_W, WIN_H, SC_IMG_COUNT, swapchainImageUsage, surfaceFormat, asset::EF_D32_SFLOAT);
9292
window = std::move(initOutput.window);
9393
gl = std::move(initOutput.apiConnection);
9494
surface = std::move(initOutput.surface);
@@ -119,6 +119,12 @@ class UIApp : public ApplicationBase
119119
cpu2gpuParams
120120
);
121121

122+
UI::Register([]()->void{
123+
UI::BeginWindow("Test window");
124+
UI::Text("Hi");
125+
UI::EndWindow();
126+
});
127+
122128
logicalDevice->createCommandBuffers(commandPools[CommonAPI::InitOutput::EQT_GRAPHICS].get(),video::IGPUCommandBuffer::EL_PRIMARY,FRAMES_IN_FLIGHT,commandBuffers);
123129

124130
//
@@ -151,6 +157,8 @@ class UIApp : public ApplicationBase
151157
commandBuffer->reset(nbl::video::IGPUCommandBuffer::ERF_RELEASE_RESOURCES_BIT);
152158
commandBuffer->begin(0);
153159

160+
swapchain->acquireNextImage(imageAcquire[resourceIx].get(), fence.get(), &acquiredNextFBO);
161+
154162
asset::SViewport viewport;
155163
viewport.minDepth = 1.f;
156164
viewport.maxDepth = 0.f;
@@ -166,9 +174,9 @@ class UIApp : public ApplicationBase
166174
area.offset = { 0,0 };
167175
area.extent = { WIN_W, WIN_H };
168176
asset::SClearValue clear[2] = {};
169-
clear[0].color.float32[0] = 1.f;
170-
clear[0].color.float32[1] = 1.f;
171-
clear[0].color.float32[2] = 1.f;
177+
clear[0].color.float32[0] = 0.f;
178+
clear[0].color.float32[1] = 0.f;
179+
clear[0].color.float32[2] = 0.f;
172180
clear[0].color.float32[3] = 1.f;
173181
clear[1].depthStencil.depth = 0.f;
174182

@@ -191,7 +199,7 @@ class UIApp : public ApplicationBase
191199
CommonAPI::Submit(logicalDevice.get(), swapchain.get(), commandBuffer.get(), queues[decltype(initOutput)::EQT_GRAPHICS], imageAcquire[resourceIx].get(), renderFinished[resourceIx].get(), fence.get());
192200
CommonAPI::Present(logicalDevice.get(), swapchain.get(), queues[decltype(initOutput)::EQT_GRAPHICS], renderFinished[resourceIx].get(), acquiredNextFBO);
193201

194-
UI::PostRender(deltaTimeInSec);
202+
UI::Update(deltaTimeInSec);
195203
}
196204

197205
bool keepRunning() override
@@ -226,9 +234,7 @@ class UIApp : public ApplicationBase
226234
core::smart_refctd_ptr<video::IGPUFence> frameComplete[FRAMES_IN_FLIGHT] = { nullptr };
227235
core::smart_refctd_ptr<video::IGPUSemaphore> imageAcquire[FRAMES_IN_FLIGHT] = { nullptr };
228236
core::smart_refctd_ptr<video::IGPUSemaphore> renderFinished[FRAMES_IN_FLIGHT] = { nullptr };
229-
230-
//video::CDumbPresentationOracle oracle;
231-
237+
232238
_NBL_STATIC_INLINE_CONSTEXPR uint64_t MAX_TIMEOUT = 99999999999999ull;
233239
uint32_t acquiredNextFBO = {};
234240
int32_t resourceIx = -1;

0 commit comments

Comments
 (0)