windows: Fix various warnings
Categories include:
ASSERT_TRUE(int) changed to ASSERT_TRUE(0 != int)
Change uint32_t to DeviceSize
Stop adding with bools
Add some explicit casting
Remove unreferenced variables
Add 'f' suffix to float literals
Conflicts:
tests/vkrenderframework.cpp
diff --git a/tests/vkrenderframework.cpp b/tests/vkrenderframework.cpp
index f52acd0..95e0ff9 100644
--- a/tests/vkrenderframework.cpp
+++ b/tests/vkrenderframework.cpp
@@ -304,9 +304,9 @@
std::vector<VkAttachmentDescription> attachments;
std::vector<VkAttachmentReference> color_references;
std::vector<VkAttachmentView> bindings;
- attachments.reserve(targets + (bool) dsBinding);
+ attachments.reserve(targets + 1); // +1 for dsBinding
color_references.reserve(targets);
- bindings.reserve(targets + (bool) dsBinding);
+ bindings.reserve(targets + 1); // +1 for dsBinding
VkAttachmentDescription att = {};
att.sType = VK_STRUCTURE_TYPE_ATTACHMENT_DESCRIPTION;
@@ -421,8 +421,8 @@
m_renderPassBeginInfo.renderPass = m_renderPass;
m_renderPassBeginInfo.framebuffer = m_framebuffer;
- m_renderPassBeginInfo.renderArea.extent.width = m_width;
- m_renderPassBeginInfo.renderArea.extent.height = m_height;
+ m_renderPassBeginInfo.renderArea.extent.width = (int32_t) m_width;
+ m_renderPassBeginInfo.renderArea.extent.height = (int32_t) m_height;
m_renderPassBeginInfo.clearValueCount = m_renderPassClearValues.size();
m_renderPassBeginInfo.pClearValues = m_renderPassClearValues.data();
}
@@ -1528,7 +1528,7 @@
0, 1, &set_obj, 0, NULL );
}
-void VkCommandBufferObj::BindIndexBuffer(VkIndexBufferObj *indexBuffer, uint32_t offset)
+void VkCommandBufferObj::BindIndexBuffer(VkIndexBufferObj *indexBuffer, VkDeviceSize offset)
{
vkCmdBindIndexBuffer(handle(), indexBuffer->handle(), offset, indexBuffer->GetIndexType());
}