Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/drape
diff options
context:
space:
mode:
authorDaria Volvenkova <d.volvenkova@corp.mail.ru>2019-02-15 13:50:32 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2019-03-01 10:45:24 +0300
commit66b22516cdd259e97cb7b93b6bebc2f2f7977082 (patch)
treee5124334faa81362c8946b8f143f35f90c9c6daf /drape
parentdc89014973ebceef3250a800ce73aa8b9581e234 (diff)
[vulkan] Bind buffer refactoring.
Diffstat (limited to 'drape')
-rw-r--r--drape/vulkan/vulkan_gpu_buffer_impl.cpp2
-rw-r--r--drape/vulkan/vulkan_object_manager.cpp3
-rw-r--r--drape/vulkan/vulkan_staging_buffer.cpp4
3 files changed, 3 insertions, 6 deletions
diff --git a/drape/vulkan/vulkan_gpu_buffer_impl.cpp b/drape/vulkan/vulkan_gpu_buffer_impl.cpp
index 23c520fac6..d2dd9eb5b6 100644
--- a/drape/vulkan/vulkan_gpu_buffer_impl.cpp
+++ b/drape/vulkan/vulkan_gpu_buffer_impl.cpp
@@ -123,8 +123,6 @@ void VulkanGPUBuffer::Resize(ref_ptr<VulkanBaseContext> context, void const * da
memcpy(gpuPtr, data, sizeInBytes);
m_objectManager->Flush(m_geometryBuffer);
}
- CHECK_VK_CALL(vkBindBufferMemory(device, m_geometryBuffer.m_buffer, m_geometryBuffer.GetMemory(),
- m_geometryBuffer.GetAlignedOffset()));
m_objectManager->Unmap(m_geometryBuffer);
diff --git a/drape/vulkan/vulkan_object_manager.cpp b/drape/vulkan/vulkan_object_manager.cpp
index 0c0b0a702b..18e7504059 100644
--- a/drape/vulkan/vulkan_object_manager.cpp
+++ b/drape/vulkan/vulkan_object_manager.cpp
@@ -98,6 +98,9 @@ VulkanObject VulkanObjectManager::CreateBuffer(VulkanMemoryManager::ResourceType
vkGetBufferMemoryRequirements(m_device, result.m_buffer, &memReqs);
result.m_allocation = m_memoryManager.Allocate(resourceType, memReqs, batcherHash);
+
+ CHECK_VK_CALL(vkBindBufferMemory(m_device, result.m_buffer, result.GetMemory(), result.GetAlignedOffset()));
+
return result;
}
diff --git a/drape/vulkan/vulkan_staging_buffer.cpp b/drape/vulkan/vulkan_staging_buffer.cpp
index 3bb42edda2..6408fdfb2e 100644
--- a/drape/vulkan/vulkan_staging_buffer.cpp
+++ b/drape/vulkan/vulkan_staging_buffer.cpp
@@ -24,10 +24,6 @@ VulkanStagingBuffer::VulkanStagingBuffer(ref_ptr<VulkanObjectManager> objectMana
vkGetBufferMemoryRequirements(device, m_object.m_buffer, &memReqs);
m_sizeAlignment = mm.GetSizeAlignment(memReqs);
m_offsetAlignment = mm.GetOffsetAlignment(kStagingBuffer);
-
- CHECK_VK_CALL(vkBindBufferMemory(device, m_object.m_buffer, m_object.GetMemory(),
- m_object.GetAlignedOffset()));
-
m_pointer = m_objectManager->Map(m_object);
}