commit 34aa5c8bb02340240969d574d69dad0f68dbcb42
author Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 23 13:38:14 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Oct 26 16:24:10 2015 -0600
tree abf8e8404d37aa896f8aaf189c0bfad1a72be54b
parent dee29ca3e336fa3889cfa95d06fbd1f06e42ccc6

bug-14827: Remove DescriptorInfo union

The DescriptorInfo union is invalid in C++

include/vulkan.h

diff --git a/include/vulkan.h b/include/vulkan.h
index e4e5655..312ed70 100644
--- a/include/vulkan.h
+++ b/include/vulkan.h
@@ -1823,16 +1823,6 @@
     VkDeviceSize                                range;
 } VkDescriptorBufferInfo;
 
-/* TODO: this should be union, except that causes a compiler error:
- * error: member 'VkDescriptorImageInfo <anonymous union>::imageInfo' with constructor not allowed in union
- * This issue should go away when the change to remove the constructor lands.
- */
-typedef struct {
-    VkDescriptorImageInfo                       imageInfo;
-    VkDescriptorBufferInfo                      bufferInfo;
-    VkBufferView                                texelBufferView;
-} VkDescriptorInfo;
-
 typedef struct {
     VkStructureType                             sType;
     const void*                                 pNext;
@@ -1841,7 +1831,9 @@
     uint32_t                                    destArrayElement;
     uint32_t                                    count;
     VkDescriptorType                            descriptorType;
-    const VkDescriptorInfo*                     pDescriptors;
+    const VkDescriptorImageInfo*                pImageInfo;
+    const VkDescriptorBufferInfo*               pBufferInfo;
+    const VkBufferView*                         pTexelBufferView;
 } VkWriteDescriptorSet;
 
 typedef struct {