Skip to content

Commit f75cb77

Browse files
committed
Merge branch 'master' into ali_dl
2 parents 7e471b4 + ff07cd7 commit f75cb77

File tree

6 files changed

+19
-10
lines changed

6 files changed

+19
-10
lines changed

3rdparty/Vulkan-Headers

Submodule Vulkan-Headers updated 61 files

cmake/adjust/flags.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -200,6 +200,6 @@ function(nbl_adjust_flags)
200200
list(APPEND _D_NBL_COMPILE_OPTIONS_ $<$<CONFIG:${NBL_MAP_CONFIGURATION_FROM}>:${NBL_TO_CONFIG_COMPILE_OPTIONS}>)
201201
endforeach()
202202

203-
set_directory_properties(PROPERTIES COMPILE_OPTIONS ${_D_NBL_COMPILE_OPTIONS_})
203+
set_directory_properties(PROPERTIES COMPILE_OPTIONS "${_D_NBL_COMPILE_OPTIONS_}")
204204
endif()
205205
endfunction()

include/nbl/builtin/hlsl/emulated/float64_t.hlsl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -516,13 +516,13 @@ struct static_cast_helper<To,emulated_float64_t<FastMath,FlushDenormToZero>,void
516516
if (exponent < 0)
517517
return 0;
518518

519-
uint64_t unsignedOutput = ieee754::extractMantissa(v.data) & 1ull << ieee754::traits<float64_t>::mantissaBitCnt;
519+
uint64_t unsignedOutput = ieee754::extractMantissa(v.data) | 1ull << ieee754::traits<float64_t>::mantissaBitCnt;
520520
const int shiftAmount = exponent - int(ieee754::traits<float64_t>::mantissaBitCnt);
521521

522522
if (shiftAmount < 0)
523-
unsignedOutput <<= -shiftAmount;
523+
unsignedOutput >>= -shiftAmount;
524524
else
525-
unsignedOutput >>= shiftAmount;
525+
unsignedOutput <<= shiftAmount;
526526

527527
if (is_signed<To>::value)
528528
{

src/nbl/video/CVulkanCommandBuffer.cpp

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,18 @@ using namespace nbl;
99
using namespace nbl::video;
1010

1111

12+
nbl::video::CVulkanCommandBuffer::~CVulkanCommandBuffer()
13+
{
14+
const auto* vulkanDevice = static_cast<const CVulkanLogicalDevice*>(getOriginDevice());
15+
auto* vk = vulkanDevice->getFunctionTable();
16+
17+
const auto* vulkanCmdPool = IBackendObject::device_compatibility_cast<const CVulkanCommandPool*>(getPool(), getOriginDevice());
18+
assert(vulkanCmdPool);
19+
20+
vk->vk.vkFreeCommandBuffers(vulkanDevice->getInternalObject(), vulkanCmdPool->getInternalObject(), 1, &m_cmdbuf);
21+
out_of_order_dtor();
22+
}
23+
1224
const VolkDeviceTable& CVulkanCommandBuffer::getFunctionTable() const
1325
{
1426
return static_cast<const CVulkanLogicalDevice*>(getOriginDevice())->getFunctionTable()->vk;

src/nbl/video/CVulkanCommandBuffer.h

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -270,10 +270,7 @@ class CVulkanCommandBuffer final : public IGPUCommandBuffer
270270
}
271271

272272
private:
273-
virtual ~CVulkanCommandBuffer() final
274-
{
275-
out_of_order_dtor();
276-
}
273+
~CVulkanCommandBuffer();
277274

278275
const VolkDeviceTable& getFunctionTable() const;
279276

0 commit comments

Comments
 (0)