Use "cached", not "coherent" for staging buffers

diff --git a/src/blue_noise.cpp b/src/blue_noise.cpp
index ca4c7148744fa256c0820c62c4b5a17159fce971..015c6f67beed9d6997ce31f96fe64a1c0df99e69 100644 (file)
--- a/src/blue_noise.cpp
+++ b/src/blue_noise.cpp
@@ -157,6 +157,34 @@ void dither::internal::vulkan_copy_buffer(VkDevice device,
   vkFreeCommandBuffers(device, command_pool, 1, &command_buf);
 }
 
+void dither::internal::vulkan_flush_buffer(VkDevice device,
+                                           VkDeviceMemory memory) {
+  VkMappedMemoryRange range{};
+  range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+  range.pNext = nullptr;
+  range.memory = memory;
+  range.offset = 0;
+  range.size = VK_WHOLE_SIZE;
+
+  if (vkFlushMappedMemoryRanges(device, 1, &range) != VK_SUCCESS) {
+    std::clog << "WARNING: vulkan_flush_buffer failed!\n";
+  }
+}
+
+void dither::internal::vulkan_invalidate_buffer(VkDevice device,
+                                                VkDeviceMemory memory) {
+  VkMappedMemoryRange range{};
+  range.sType = VK_STRUCTURE_TYPE_MAPPED_MEMORY_RANGE;
+  range.pNext = nullptr;
+  range.memory = memory;
+  range.offset = 0;
+  range.size = VK_WHOLE_SIZE;
+
+  if (vkInvalidateMappedMemoryRanges(device, 1, &range) != VK_SUCCESS) {
+    std::clog << "WARNING: vulkan_invalidate_buffer failed!\n";
+  }
+}
+
 std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
     VkDevice device, VkPhysicalDevice phys_device,
     VkCommandBuffer command_buffer, VkCommandPool command_pool, VkQueue queue,
@@ -178,7 +206,7 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
   if (!internal::vulkan_create_buffer(device, phys_device, size * sizeof(int),
                                       VK_BUFFER_USAGE_TRANSFER_SRC_BIT,
                                       VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                                          VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                                          VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
                                       staging_pbp_buffer,
                                       staging_pbp_buffer_mem)) {
     std::clog << "get_filter ERROR: Failed to create staging pbp buffer!\n";
@@ -197,7 +225,7 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
   vkMapMemory(device, staging_pbp_buffer_mem, 0, size * sizeof(int), 0,
               &pbp_mapped);
   utility::Cleanup cleanup_pbp_mapped(
-      [device](void *ptr) { vkUnmapMemory(device, *((VkDeviceMemory  *)ptr)); },
+      [device](void *ptr) { vkUnmapMemory(device, *((VkDeviceMemory *)ptr)); },
       &staging_pbp_buffer_mem);
   int *pbp_mapped_int = (int *)pbp_mapped;
 
@@ -207,7 +235,7 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
   if (!internal::vulkan_create_buffer(device, phys_device, size * sizeof(int),
                                       VK_BUFFER_USAGE_TRANSFER_DST_BIT,
                                       VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT |
-                                          VK_MEMORY_PROPERTY_HOST_COHERENT_BIT,
+                                          VK_MEMORY_PROPERTY_HOST_CACHED_BIT,
                                       staging_filter_buffer,
                                       staging_filter_buffer_mem)) {
     std::clog << "get_filter ERROR: Failed to create staging pbp buffer!\n";
@@ -226,7 +254,7 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
   vkMapMemory(device, staging_filter_buffer_mem, 0, size * sizeof(float), 0,
               &filter_mapped);
   utility::Cleanup cleanup_filter_mapped(
-      [device](void *ptr) { vkUnmapMemory(device, *((VkDeviceMemory  *)ptr)); },
+      [device](void *ptr) { vkUnmapMemory(device, *((VkDeviceMemory *)ptr)); },
       &staging_filter_buffer_mem);
   float *filter_mapped_float = (float *)filter_mapped;
 
@@ -234,6 +262,7 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
                            pipeline, pipeline_layout, descriptor_set,
                            filter_out_buf, size, &pbp, &reversed_pbp,
                            global_size, pbp_mapped_int, staging_pbp_buffer,
+                           staging_pbp_buffer_mem, staging_filter_buffer_mem,
                            staging_filter_buffer]() -> bool {
     vkResetCommandBuffer(command_buffer, 0);
 
@@ -245,6 +274,8 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
       }
     }
 
+    vulkan_flush_buffer(device, staging_pbp_buffer_mem);
+
     // Copy pbp buffer.
     vulkan_copy_buffer(device, command_pool, queue, staging_pbp_buffer, pbp_buf,
                        size * sizeof(int));
@@ -292,6 +323,8 @@ std::vector<unsigned int> dither::internal::blue_noise_vulkan_impl(
     vulkan_copy_buffer(device, command_pool, queue, filter_out_buf,
                        staging_filter_buffer, size * sizeof(float));
 
+    vulkan_flush_buffer(device, staging_filter_buffer_mem);
+
     return true;
   };
 

diff --git a/src/blue_noise.hpp b/src/blue_noise.hpp
index 882e6f1cca880ae845a74f55166207abe9456526..7ae79720fc8028cc415218091b92cea1034009f1 100644 (file)
--- a/src/blue_noise.hpp
+++ b/src/blue_noise.hpp
@@ -60,6 +60,9 @@ void vulkan_copy_buffer(VkDevice device, VkCommandPool command_pool,
                         VkQueue queue, VkBuffer src_buf, VkBuffer dst_buf,
                         VkDeviceSize size);
 
+void vulkan_flush_buffer(VkDevice device, VkDeviceMemory memory);
+void vulkan_invalidate_buffer(VkDevice device, VkDeviceMemory memory);
+
 std::vector<unsigned int> blue_noise_vulkan_impl(
     VkDevice device, VkPhysicalDevice phys_device,
     VkCommandBuffer command_buffer, VkCommandPool command_pool, VkQueue queue,