Browse Source

Vk: Use explicit conversions for MSVC

Signed-off-by: Squareys <squareys@googlemail.com>
pull/202/head
Squareys 10 years ago committed by Squareys
parent
commit
176649b65b
  1. 2
      src/Magnum/Vk/Buffer.cpp
  2. 2
      src/Magnum/Vk/Command.h
  3. 2
      src/Magnum/Vk/CommandBuffer.h
  4. 4
      src/Magnum/Vk/Pipeline.h

2
src/Magnum/Vk/Buffer.cpp

@ -48,7 +48,7 @@ Buffer& Buffer::update(Queue& queue, CommandPool& pool, const void* sourceData,
std::unique_ptr<Vk::CommandBuffer> copyToDeviceCmds = pool.allocateCommandBuffer(Vk::CommandBuffer::Level::Primary);
/* plane vertices */
Buffer stagingBuffer{*_device, size, Vk::BufferUsage::TransferSrc};
Buffer stagingBuffer{*_device, UnsignedInt(size), Vk::BufferUsage::TransferSrc};
std::unique_ptr<DeviceMemory> stagingMemory = stagingBuffer.allocateDeviceMemory(Vk::MemoryProperty::HostVisible);
Containers::ArrayView<char> data = stagingMemory->map(destOffset, size);

2
src/Magnum/Vk/Command.h

@ -71,7 +71,7 @@ inline auto setScissor(UnsignedInt firstScissor, const std::initializer_list<Ran
UnsignedInt i = 0;
for(auto& range: ranges) {
vkRects[i] = {{range.left(), range.bottom()}, {range.sizeX(), range.sizeY()}};
vkRects[i] = {{range.left(), range.bottom()}, {UnsignedInt(range.sizeX()), UnsignedInt(range.sizeY())}};
++i;
}
vkCmdSetScissor(cmdBuffer, firstScissor, vkRects.size(), vkRects.data());

2
src/Magnum/Vk/CommandBuffer.h

@ -151,7 +151,7 @@ class MAGNUM_VK_EXPORT CommandBuffer {
nullptr,
renderPass,
framebuffer,
VkRect2D{{renderArea.left(), renderArea.bottom()}, {renderArea.sizeX(), renderArea.sizeY()}},
VkRect2D{{renderArea.left(), renderArea.bottom()}, {UnsignedInt(renderArea.sizeX()), UnsignedInt(renderArea.sizeY())}},
clearValues.size(),
clearValues.data()};

4
src/Magnum/Vk/Pipeline.h

@ -234,7 +234,7 @@ class MAGNUM_VK_EXPORT GraphicsPipelineBuilder {
VK_BLEND_OP_ADD,
VK_BLEND_FACTOR_ZERO, VK_BLEND_FACTOR_ZERO,
VK_BLEND_OP_ADD,
0xf
UnsignedInt(0xf)
};
_blendAttachments.push_back(blendAttachmentState);
@ -244,7 +244,7 @@ class MAGNUM_VK_EXPORT GraphicsPipelineBuilder {
0,
VK_FALSE,
VK_LOGIC_OP_CLEAR,
_blendAttachments.size(),
UnsignedInt(_blendAttachments.size()),
_blendAttachments.data(),
{0.0f, 0.0f, 0.0f, 0.0f}
};

Loading…
Cancel
Save