From 6dfd865300ea1a7407f90f9e6fb81cda7412b031 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Branimir=20Karad=C5=BEi=C4=87?= <branimirkaradzic@gmail.com>
Date: Sat, 21 Dec 2024 18:08:42 -0800
Subject: [PATCH] Fixed MSVC warnings.
---
src/renderer_vk.cpp | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/renderer_vk.cpp b/src/renderer_vk.cpp
index e16cf8028e..695260474d 100644
--- a/src/renderer_vk.cpp
+++ b/src/renderer_vk.cpp
@@ -6246,7 +6246,7 @@ VK_DESTROY
mappedMemory += imageInfos[ii].size;
bufferCopyInfo[ii].bufferOffset += stagingBuffer.m_offset;
BX_ASSERT(
- bx::uint32_mod(bufferCopyInfo[ii].bufferOffset, dstBlockInfo.blockSize) == 0
+ bx::uint32_mod(bx::narrowCast<uint32_t>(bufferCopyInfo[ii].bufferOffset), dstBlockInfo.blockSize) == 0
, "Alignment for subimage %u is not aligned correctly (%u)."
, ii, bufferCopyInfo[ii].bufferOffset, dstBlockInfo.blockSize
);
@@ -6538,7 +6538,7 @@ VK_DESTROY
for (uint32_t ii = 0; ii < _bufferImageCopyCount; ++ii)
{
BX_ASSERT(
- bx::uint32_mod(_bufferImageCopy[ii].bufferOffset, blockInfo.blockSize) == 0
+ bx::uint32_mod(bx::narrowCast<uint32_t>(_bufferImageCopy[ii].bufferOffset), blockInfo.blockSize) == 0
, "Misaligned texture of type %s to offset %u, which is not a multiple of %u."
, bimg::getName(format), _bufferImageCopy[ii].bufferOffset, blockInfo.blockSize
);
@@ -8596,10 +8596,10 @@ VK_DESTROY
restoreScissor = false;
// Clamp the rect to what's valid according to Vulkan.
- rect.m_width = bx::min(rect.m_width, fb.m_width - rect.m_x);
- rect.m_height = bx::min(rect.m_height, fb.m_height - rect.m_y);
- if (_render->m_view[view].m_rect.m_width != rect.m_width
- || _render->m_view[view].m_rect.m_height != rect.m_height)
+ rect.m_width = bx::min(rect.m_width, bx::narrowCast<uint16_t>(fb.m_width) - rect.m_x);
+ rect.m_height = bx::min(rect.m_height, bx::narrowCast<uint16_t>(fb.m_height) - rect.m_y);
+ if (_render->m_view[view].m_rect.m_width != rect.m_width
+ || _render->m_view[view].m_rect.m_height != rect.m_height)
{
BX_TRACE("Clamp render pass from %dx%d to %dx%d"
, _render->m_view[view].m_rect.m_width