[vk] Fix regressions introduced by #3997 w.r.t to marked stages for pipeline barriers

Signed-off-by: lizzie <lizzie@eden-emu.dev>

src/video_core/renderer_vulkan/vk_scheduler.cpp

@@ -267,8 +267,7 @@ u64 Scheduler::SubmitExecution(VkSemaphore signal_semaphore, VkSemaphore wait_se
             .srcAccessMask = VK_ACCESS_TRANSFER_WRITE_BIT,
             .dstAccessMask = VK_ACCESS_MEMORY_READ_BIT | VK_ACCESS_MEMORY_WRITE_BIT,
         };
-        upload_cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_VERTEX_SHADER_BIT
+        upload_cmdbuf.PipelineBarrier(VK_PIPELINE_STAGE_TRANSFER_BIT, VK_PIPELINE_STAGE_ALL_COMMANDS_BIT, 0, WRITE_BARRIER);
-            | VK_PIPELINE_STAGE_FRAGMENT_SHADER_BIT | VK_PIPELINE_STAGE_COLOR_ATTACHMENT_OUTPUT_BIT, 0, WRITE_BARRIER);
         upload_cmdbuf.End();
         cmdbuf.End();
 

src/video_core/vulkan_common/vulkan_memory_allocator.cpp

@@ -256,20 +256,18 @@ namespace Vulkan {
                          device.GetDispatchLoader());
     }
 
-    vk::Buffer MemoryAllocator::CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage) const {
+    vk::Buffer
-        // MESA will do memcpy() if not marked as host cached, so just force mark it for most buffers
+    MemoryAllocator::CreateBuffer(const VkBufferCreateInfo &ci, MemoryUsage usage) const
-        auto const anv_flags = (usage == MemoryUsage::Stream
+    {
-            && device.GetDriverID() == VK_DRIVER_ID_INTEL_OPEN_SOURCE_MESA)
-            ? VK_MEMORY_PROPERTY_HOST_CACHED_BIT : 0;
         const VmaAllocationCreateInfo alloc_ci = {
-            .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage),
+                .flags = VMA_ALLOCATION_CREATE_WITHIN_BUDGET_BIT | MemoryUsageVmaFlags(usage),
-            .usage = MemoryUsageVma(usage),
+                .usage = MemoryUsageVma(usage),
-            .requiredFlags = 0,
+                .requiredFlags = 0,
-            .preferredFlags = MemoryUsagePreferredVmaFlags(usage) | anv_flags,
+                .preferredFlags = MemoryUsagePreferredVmaFlags(usage),
-            .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
+                .memoryTypeBits = usage == MemoryUsage::Stream ? 0u : valid_memory_types,
-            .pool = VK_NULL_HANDLE,
+                .pool = VK_NULL_HANDLE,
-            .pUserData = nullptr,
+                .pUserData = nullptr,
-            .priority = 0.f,
+                .priority = 0.f,
         };
 
         VkBuffer handle{};