Skip to content

Commit 77ed416

Browse files
committed
keep designated initializers for ISwapchain's SSharedCreationParams, use hlsl::ShaderStage in IDescriptorSetLayout.h
1 parent a1b9b99 commit 77ed416

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

include/nbl/asset/IDescriptorSetLayout.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,8 @@ class IDescriptorSetLayout : public IDescriptorSetLayoutBase
330330
bindings[i].binding = i;
331331
bindings[i].type = type;
332332
bindings[i].createFlags = SBinding::E_CREATE_FLAGS::ECF_NONE;
333-
bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:asset::IShader::E_SHADER_STAGE::ESS_ALL_OR_LIBRARY;
333+
334+
bindings[i].stageFlags = stageAccessFlags ? stageAccessFlags[i]:hlsl::ShaderStage::ESS_ALL_OR_LIBRARY;
334335
bindings[i].count = counts ? counts[i]:1u;
335336
bindings[i].samplers = nullptr;
336337
}

include/nbl/video/ISwapchain.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ class ISwapchain : public IBackendObject
2121

2222
struct SSharedCreationParams
2323
{
24-
SSharedCreationParams() {}
25-
2624
inline bool valid(const IPhysicalDevice* physDev, const ISurface* surface) const
2725
{
2826
ISurface::SCapabilities caps;
@@ -456,12 +454,13 @@ class ISwapchain : public IBackendObject
456454
{
457455
return params.deduce(getOriginDevice()->getPhysicalDevice(),m_params.surface.get(),{&m_params.sharedParams.presentMode.value,1},{&m_params.sharedParams.compositeAlpha.value,1},{&m_params.sharedParams.preTransform.value,1});
458456
}
459-
inline core::smart_refctd_ptr<ISwapchain> recreate(SSharedCreationParams params={})
457+
inline core::smart_refctd_ptr<ISwapchain> recreate(SSharedCreationParams params)
460458
{
461459
if (!deduceRecreationParams(params))
462460
return nullptr;
463461
return recreate_impl(std::move(params));
464462
}
463+
inline core::smart_refctd_ptr<ISwapchain> recreate() { return recreate({}); }
465464

466465
// Vulkan: const VkSwapchainKHR*
467466
virtual const void* getNativeHandle() const = 0;

0 commit comments

Comments
 (0)