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

demos/cube.c

diff --git a/demos/cube.c b/demos/cube.c
index 6792627..a435c01 100644
--- a/demos/cube.c
+++ b/demos/cube.c
@@ -1657,9 +1657,9 @@
 
     memset(&tex_descs, 0, sizeof(tex_descs));
     for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
-        tex_descs[i].sampler = demo->textures[i].sampler;
-        tex_descs[i].imageView = demo->textures[i].view;
-        tex_descs[i].imageLayout = VK_IMAGE_LAYOUT_GENERAL;
+        tex_descs[i].imageInfo.sampler = demo->textures[i].sampler;
+        tex_descs[i].imageInfo.imageView = demo->textures[i].view;
+        tex_descs[i].imageInfo.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
     }
 
     memset(&writes, 0, sizeof(writes));

demos/tri.c

diff --git a/demos/tri.c b/demos/tri.c
index 3f48748..d03bf16 100644
--- a/demos/tri.c
+++ b/demos/tri.c
@@ -1413,9 +1413,9 @@
 
     memset(&tex_descs, 0, sizeof(tex_descs));
     for (i = 0; i < DEMO_TEXTURE_COUNT; i++) {
-        tex_descs[i].sampler = demo->textures[i].sampler;
-        tex_descs[i].imageView = demo->textures[i].view;
-        tex_descs[i].imageLayout = VK_IMAGE_LAYOUT_GENERAL;
+        tex_descs[i].imageInfo.sampler = demo->textures[i].sampler;
+        tex_descs[i].imageInfo.imageView = demo->textures[i].view;
+        tex_descs[i].imageInfo.imageLayout = VK_IMAGE_LAYOUT_GENERAL;
     }
 
     memset(&write, 0, sizeof(write));