From bf880fde0c2d89173eea82e61781f2266e2474ad Mon Sep 17 00:00:00 2001
From: "Herman S." <429230+has207@users.noreply.github.com>
Date: Sat, 13 Dec 2025 12:07:34 +0900
Subject: [PATCH] [Vulkan] Fix alignment related validation errors

---
 src/xenia/ui/vulkan/vulkan_device.cc | 2 ++
 src/xenia/ui/vulkan/vulkan_device.h  | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/src/xenia/ui/vulkan/vulkan_device.cc b/src/xenia/ui/vulkan/vulkan_device.cc
index dc5b46894..36143a2ff 100644
--- a/src/xenia/ui/vulkan/vulkan_device.cc
+++ b/src/xenia/ui/vulkan/vulkan_device.cc
@@ -624,6 +624,8 @@ std::unique_ptr<VulkanDevice> VulkanDevice::CreateIfSupported(
   if (properties.apiVersion >= VK_MAKE_API_VERSION(0, 1, 2, 0)) {
     if (with_gpu_emulation) {
       XE_UI_VULKAN_FEATURE_2(features_1_2, samplerMirrorClampToEdge);
+      XE_UI_VULKAN_FEATURE_2(features_1_2, uniformBufferStandardLayout);
+      XE_UI_VULKAN_FEATURE_2(features_1_2, scalarBlockLayout);
     }
   } else {
     if (ext_1_2_KHR_sampler_mirror_clamp_to_edge) {
diff --git a/src/xenia/ui/vulkan/vulkan_device.h b/src/xenia/ui/vulkan/vulkan_device.h
index 7c2ad22cd..30295e358 100644
--- a/src/xenia/ui/vulkan/vulkan_device.h
+++ b/src/xenia/ui/vulkan/vulkan_device.h
@@ -118,6 +118,14 @@ class VulkanDevice {
 
     bool samplerMirrorClampToEdge = false;
 
+    // VK_KHR_uniform_buffer_standard_layout (#253, promoted to 1.2)
+
+    bool uniformBufferStandardLayout = false;
+
+    // VK_EXT_scalar_block_layout (#222, promoted to 1.2)
+
+    bool scalarBlockLayout = false;
+
     // VK_KHR_portability_subset (#164)
 
     bool constantAlphaColorBlendFactors = false;