From a2ad5d9eac16df92c9be36eae8c746f4b4c2e432 Mon Sep 17 00:00:00 2001
From: Matthew Waters <matthew@centricular.com>
Date: Fri, 5 Feb 2016 19:10:43 +1100
Subject: [PATCH] vkmacros: use specific _INIT macros to initialize structures

---
 ext/vulkan/vkmacros.h | 98 +++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 72 insertions(+), 26 deletions(-)

diff --git a/ext/vulkan/vkmacros.h b/ext/vulkan/vkmacros.h
index f94d9e1..d2d2e95 100644
--- a/ext/vulkan/vkmacros.h
+++ b/ext/vulkan/vkmacros.h
@@ -25,52 +25,98 @@
 
 G_BEGIN_DECLS
 
+#define GST_VK_STRUCT_1(a) \
+  { a }
+#define GST_VK_STRUCT_2(a, b) \
+  { a, b }
+#define GST_VK_STRUCT_3(a, b, c) \
+  { a, b, c }
+#define GST_VK_STRUCT_4(a, b, c, d) \
+  { a, b, c, d }
+#define GST_VK_STRUCT_5(a, b, c, d, e) \
+  { a, b, c, d, e }
+#define GST_VK_STRUCT_6(a, b, c, d, e, f) \
+  { a, b, c, d, e, f }
+#define GST_VK_STRUCT_7(a, b, c, d, e, f, g) \
+  { a, b, c, d, e, f, g }
+
+#define GST_VK_BUFFER_IMAGE_COPY_INIT GST_VK_STRUCT_6
+#define GST_VK_BUFFER_IMAGE_COPY(info,bufferOffset_,bufferRowLength_,bufferImageHeight_,imageSubresourceLayers_,imageOffset_,imageExtent_) \
+  G_STMT_START { \
+    VkImageSubresourceLayers sub = imageSubresourceLayers_; \
+    VkOffset3D offset = imageOffset_; \
+    VkExtent3D extent = imageExtent_; \
+    VkBufferImageCopy tmp = GST_VK_BUFFER_IMAGE_COPY_INIT(bufferOffset_,bufferRowLength_,bufferImageHeight_,sub,offset,extent); \
+    (region) = tmp; \
+  } G_STMT_END
+
+#define GST_VK_COMPONENT_MAPPING_INIT GST_VK_STRUCT_4
 #define GST_VK_COMPONENT_MAPPING(component, r_, g_, b_, a_) \
   G_STMT_START { \
-    component.r = r_; \
-    component.g = g_; \
-    component.b = b_; \
-    component.a = a_; \
+    VkComponentMapping tmp = GST_VK_COMPONENT_MAPPING_INIT(r_, g_, b_, a_); \
+    (component) = tmp; \
   } G_STMT_END
 
+#define GST_VK_EXTENT3D_INIT GST_VK_STRUCT_3
 #define GST_VK_EXTENT3D(extent,w,h,d) \
   G_STMT_START { \
-    extent.width = w; \
-    extent.height = h; \
-    extent.depth = d; \
+    VkExtent3D tmp = GST_VK_EXTENT3D_INIT(w,h,d); \
+    (extent) = tmp; \
+  } G_STMT_END
+
+#define GST_VK_IMAGE_COPY_INIT GST_VK_STRUCT_5
+#define GST_VK_IMAGE_COPY(copy,srcSubresource_,srcOffset_,dstSubresource_,dstOffset_,extent_) \
+  G_STMT_START { \
+    VkImageSubresourceLayers src_res = srcSubresource_; \
+    VkOffset3D src_offset = srcOffset_; \
+    VkImageSubresourceLayers dst_res = dstSubresource_; \
+    VkOffset3D dst_offset = dstOffset_; \
+    VkExtent3D ext = extent_; \
+    VkImageCopy tmp = GST_VK_IMAGE_COPY_INIT(src_res,src_offset,dst_res,dst_offset,ext); \
+    (copy) = tmp; \
+  } G_STMT_END
+
+#define GST_VK_IMAGE_BLIT_INIT GST_VK_STRUCT_6
+#define GST_VK_IMAGE_BLIT(blit,srcSubresource_,srcOffset_,srcExtent_,dstSubresource_,dstOffset_,dstExtent_) \
+  G_STMT_START { \
+    VkImageSubresourceLayers src_res = srcSubresource_; \
+    VkOffset3D src_offset = srcOffset; \
+    VkExtent3D src_ext = srcExtent_; \
+    VkImageSubresourceLayers dst_res = dstSubresource_; \
+    VkOffset3D dst_offset = dstSubresource_; \
+    VkExtent3D dst_ext = dstExtent_; \
+    VkImageBlit tmp = GST_VK_IMAGE_BLIT_INIT(src_res, src_offset, src_ext, dst_res, dst_offset, dst_ext); \
+    (blit) = tmp; \
   } G_STMT_END
 
-#define GST_VK_IMAGE_SUBRESOURCE(sub,a,m,l) \
-    G_STMT_START { \
-      sub.aspectMask = a; \
-      sub.mipLevel = m; \
-      sub.arrayLayer = l; \
-    } G_STMT_END
+#define GST_VK_IMAGE_SUBRESOURCE_INIT GST_VK_STRUCT_3
+#define GST_VK_IMAGE_SUBRESOURCE(subresource,aspectMast,mipLevel,arrayLayer) \
+  G_STMT_START { \
+    VkImageSubresource tmp = GST_VK_IMAGE_SUBRESOURCE_INIT(aspectMast,mipLevel,arrayLayer); \
+    (subresource) = tmp; \
+  } G_STMT_END
 
+#define GST_VK_IMAGE_SUBRESOURCE_LAYERS_INIT GST_VK_STRUCT_4
 #define GST_VK_IMAGE_SUBRESOURCE_LAYERS(res,aspect_,mip,base_layer,layer_count) \
   G_STMT_START { \
-    res.aspectMask = aspect_; \
-    res.mipLevel = mip; \
-    res.baseArrayLayer = base_layer; \
-    res.layerCount = layer_count; \
+    VkImageSubresourceLayers tmp = GST_VK_IMAGE_SUBRESOURCE_LAYERS_INIT(aspect_,mip,base_layer,layer_count); \
+    (res) = tmp; \
   } G_STMT_END
 
+#define GST_VK_IMAGE_SUBRESOURCE_RANGE_INIT GST_VK_STRUCT_5
 #define GST_VK_IMAGE_SUBRESOURCE_RANGE(range, aspect, mip_lvl, mip_lvl_count, array, layer_count) \
   G_STMT_START { \
-    range.aspectMask = aspect; \
-    range.baseMipLevel = mip_lvl; \
-    range.levelCount = mip_lvl_count; \
-    range.baseArrayLayer = array; \
-    range.layerCount = layer_count; \
+    VkImageSubresourceRange tmp = GST_VK_IMAGE_SUBRESOURCE_RANGE_INIT(aspect,mip_lvl,mip_lvl_count,array,layer_count); \
+    (range) = tmp; \
   } G_STMT_END
 
+#define GST_VK_OFFSET3D_INIT GST_VK_STRUCT_3
 #define GST_VK_OFFSET3D(offset,x_,y_,z_) \
   G_STMT_START { \
-    offset.x = x_; \
-    offset.y = y_; \
-    offset.z = z_; \
+    VkOffset3D tmp = GST_VK_OFFSET3D_INIT (x_,y_,z_); \
+    (offset) = tmp; \
   } G_STMT_END
 
 G_END_DECLS
 
-#endif /*_VK_UTILS_H_ */
+#endif /*_VK_MACROS_H_ */
-- 
2.7.4