commit e40997436d904c5cdf437bb59eb95d0a2a3d3b35
author Courtney Goeltzenleuchter <courtney@LunarG.com> Thu Oct 22 15:31:56 2015 -0600
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Oct 23 17:32:04 2015 -0600
tree 10bbdf3fca33df0d2ce4953686077bbb2c20bdcc
parent a32436bf5e4ce686e72fef8499d3ca9eb2b2502b

bug-14827: Make DescriptorInfo a union of bufferInfo, imageInfo, and bufferView

tests/layer_validation_tests.cpp

diff --git a/tests/layer_validation_tests.cpp b/tests/layer_validation_tests.cpp
index ad7700b..3863611 100644
--- a/tests/layer_validation_tests.cpp
+++ b/tests/layer_validation_tests.cpp
@@ -2796,7 +2796,7 @@
 
     VkDescriptorInfo descriptor_info;
     memset(&descriptor_info, 0, sizeof(descriptor_info));
-    descriptor_info.sampler = sampler;
+    descriptor_info.imageInfo.sampler = sampler;
 
     VkWriteDescriptorSet descriptor_write;
     memset(&descriptor_write, 0, sizeof(descriptor_write));
@@ -2890,7 +2890,7 @@
 
     VkDescriptorInfo descriptor_info;
     memset(&descriptor_info, 0, sizeof(descriptor_info));
-    descriptor_info.sampler = sampler;
+    descriptor_info.imageInfo.sampler = sampler;
 
     VkWriteDescriptorSet descriptor_write;
     memset(&descriptor_write, 0, sizeof(descriptor_write));
@@ -2984,7 +2984,7 @@
 
     VkDescriptorInfo descriptor_info;
     memset(&descriptor_info, 0, sizeof(descriptor_info));
-    descriptor_info.sampler = sampler;
+    descriptor_info.imageInfo.sampler = sampler;
 
     VkWriteDescriptorSet descriptor_write;
     memset(&descriptor_write, 0, sizeof(descriptor_write));
@@ -3079,7 +3079,7 @@
 
     VkDescriptorInfo descriptor_info;
     memset(&descriptor_info, 0, sizeof(descriptor_info));
-    descriptor_info.sampler = sampler;
+    descriptor_info.imageInfo.sampler = sampler;
 
     VkWriteDescriptorSet descriptor_write;
     memset(&descriptor_write, 0, sizeof(descriptor_write));