From 4613c6b8b8296110438ebc5a0300d712719f8f98 Mon Sep 17 00:00:00 2001
From: gibbed <rick@gibbed.us>
Date: Wed, 23 May 2018 20:31:33 -0500
Subject: [PATCH] [Vulkan] Better macro for channel swizzling.

---
 src/xenia/gpu/vulkan/texture_cache.cc | 30 +++++++++++++++------------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/src/xenia/gpu/vulkan/texture_cache.cc b/src/xenia/gpu/vulkan/texture_cache.cc
index 643f8b922..92eccd432 100644
--- a/src/xenia/gpu/vulkan/texture_cache.cc
+++ b/src/xenia/gpu/vulkan/texture_cache.cc
@@ -600,21 +600,25 @@ TextureCache::TextureView* TextureCache::DemandView(Texture* texture,
       swiz_component_map[(swizzle >> 9) & 0x7],
   };
 
-#define GET_CHANNEL(x)                                                 \
-  config.swizzle_##x >= 0                                              \
-      ? unswizzled_channels[config.swizzle_##x]                        \
-      : ((-(config.swizzle_##x) - 1) < xe::countof(swiz_component_map) \
-             ? swiz_component_map[-(config.swizzle_##x) - 1]           \
-             : VK_COMPONENT_SWIZZLE_IDENTITY)
+#define SWIZZLE_CHANNEL(x)                                                 \
+  {                                                                        \
+    assert_true((config.swizzle_##x >= 0 &&                                \
+                 config.swizzle_##x < xe::countof(unswizzled_channels)) || \
+                (config.swizzle_##x < 0 &&                                 \
+                 config.swizzle_##x >=                                     \
+                     -static_cast<int>(xe::countof(swiz_component_map)))); \
+    view_info.components.x =                                               \
+        config.swizzle_##x >= 0                                            \
+            ? unswizzled_channels[config.swizzle_##x]                      \
+            : swiz_component_map[-(config.swizzle_##x) - 1];               \
+  }
 
-  view_info.components = {
-      GET_CHANNEL(r),
-      GET_CHANNEL(g),
-      GET_CHANNEL(b),
-      GET_CHANNEL(a),
-  };
+  SWIZZLE_CHANNEL(r);
+  SWIZZLE_CHANNEL(g);
+  SWIZZLE_CHANNEL(b);
+  SWIZZLE_CHANNEL(a);
 
-#undef GET_CHANNEL
+#undef SWIZZLE_CHANNEL
 
   view_info.subresourceRange = {VK_IMAGE_ASPECT_COLOR_BIT, 0,
                                 texture->texture_info.mip_levels, 0, 1};