From c2040d49fa331e30bb438b5c98e324277eba58d1 Mon Sep 17 00:00:00 2001 From: Squareys Date: Sun, 24 Jul 2016 12:07:50 +0200 Subject: [PATCH] Vk: Add ability to get descriptor from buffer and check an error --- src/Magnum/Vk/Buffer.h | 9 +++++++++ src/Magnum/Vk/DescriptorSet.h | 1 + 2 files changed, 10 insertions(+) diff --git a/src/Magnum/Vk/Buffer.h b/src/Magnum/Vk/Buffer.h index 1d8e88695..9b9dbf285 100644 --- a/src/Magnum/Vk/Buffer.h +++ b/src/Magnum/Vk/Buffer.h @@ -132,6 +132,15 @@ class MAGNUM_VK_EXPORT Buffer { }; } + VkDescriptorBufferInfo getDescriptor() { + VkDescriptorBufferInfo descriptor; + descriptor.buffer = _buffer; + descriptor.offset = 0; + descriptor.range = _size; + + return descriptor; + } + private: Device& _device; VkBuffer _buffer; diff --git a/src/Magnum/Vk/DescriptorSet.h b/src/Magnum/Vk/DescriptorSet.h index 72a510417..d1b97d75a 100644 --- a/src/Magnum/Vk/DescriptorSet.h +++ b/src/Magnum/Vk/DescriptorSet.h @@ -89,6 +89,7 @@ class MAGNUM_VK_EXPORT DescriptorSetLayout { }; VkResult err = vkCreateDescriptorSetLayout(_device, &descLayout, nullptr, &_layout); + MAGNUM_VK_ASSERT_ERROR(err); } /** @brief Copying is not allowed */