Merge branch 'vtx_cache'

src/xenia/ui/vulkan/circular_buffer.cc

@@ -42,7 +42,7 @@ CircularBuffer::CircularBuffer(VulkanDevice* device, VkBufferUsageFlags usage,
 
   VkMemoryRequirements reqs;
   vkGetBufferMemoryRequirements(*device_, gpu_buffer_, &reqs);
-  alignment_ = reqs.alignment;
+  alignment_ = xe::round_up(alignment, reqs.alignment);
 }
 CircularBuffer::~CircularBuffer() { Shutdown(); }
 

src/xenia/ui/vulkan/vulkan_util.h

@@ -26,10 +26,14 @@ namespace ui {
 namespace vulkan {
 
 #define VK_SAFE_DESTROY(fn, dev, obj, alloc) \
-  if (obj) {                                 \
-    fn(dev, obj, alloc);                     \
-    obj = nullptr;                           \
-  }
+                                             \
+  do {                                       \
+    if (obj) {                               \
+      fn(dev, obj, alloc);                   \
+      obj = nullptr;                         \
+    }                                        \
+                                             \
+  } while (0)
 
 class Fence {
  public: