Henri Verbeet : vkd3d-shader: Introduce an enumeration for swizzle components.

[Alexandre Julliard]

Module: vkd3d
Branch: master
Commit: 2dd0d207d5dd2232c0720602e01d6bc33a3130e7
URL:    https://source.winehq.org/git/vkd3d.git/?a=commit;h=2dd0d207d5dd2232c0720602...

Author: Henri Verbeet <hverbeet(a)codeweavers.com>
Date:   Thu Aug 13 17:55:40 2020 +0430

vkd3d-shader: Introduce an enumeration for swizzle components.

Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>

---

 include/vkd3d_shader.h | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/vkd3d_shader.h b/include/vkd3d_shader.h
index e4d8a50..1ece69d 100644
--- a/include/vkd3d_shader.h
+++ b/include/vkd3d_shader.h
@@ -731,10 +731,15 @@ struct vkd3d_shader_signature
 };
 
 /* swizzle bits fields: wwzzyyxx */
-#define VKD3D_SHADER_SWIZZLE_X (0u)
-#define VKD3D_SHADER_SWIZZLE_Y (1u)
-#define VKD3D_SHADER_SWIZZLE_Z (2u)
-#define VKD3D_SHADER_SWIZZLE_W (3u)
+enum vkd3d_shader_swizzle_component
+{
+    VKD3D_SHADER_SWIZZLE_X = 0x0,
+    VKD3D_SHADER_SWIZZLE_Y = 0x1,
+    VKD3D_SHADER_SWIZZLE_Z = 0x2,
+    VKD3D_SHADER_SWIZZLE_W = 0x3,
+
+    VKD3D_FORCE_32_BIT_ENUM(VKD3D_SHADER_SWIZZLE_COMPONENT),
+};
 
 #define VKD3D_SHADER_SWIZZLE_MASK (0x3u)
 #define VKD3D_SHADER_SWIZZLE_SHIFT(idx) (2u * (idx))