commit f93c1bd259a0ce140d9d945a58c1611c31361e90
author Jon Ashburn <jon@lunarg.com> Mon Oct 20 13:37:31 2014 -0600
committer Jon Ashburn <jon@lunarg.com> Tue Oct 21 09:31:45 2014 -0600
tree 3f032ae6ef4af54cf0f98bc8ac5c4395596d9541
parent d9fc9845afd6ad07f6c46993b1ca8a616a1e5a3f

tests: Fix issue in tests where descriptor set mapping array not initialized

tests/init.cpp

diff --git a/tests/init.cpp b/tests/init.cpp
index b5fa0dc..ba2a853 100644
--- a/tests/init.cpp
+++ b/tests/init.cpp
@@ -771,6 +771,10 @@
     vs_stage.shader.shader = vs;
     vs_stage.shader.descriptorSetMapping[0].descriptorCount = 1;
     vs_stage.shader.descriptorSetMapping[0].pDescriptorInfo = &ds_vs;
+    for (unsigned int i = 1; i < XGL_MAX_DESCRIPTOR_SETS; i++) {
+        vs_stage.shader.descriptorSetMapping[i].descriptorCount = 0;
+        vs_stage.shader.descriptorSetMapping[i].pDescriptorInfo = XGL_NULL_HANDLE;
+    }
     vs_stage.shader.linkConstBufferCount = 0;
     vs_stage.shader.pLinkConstBufferInfo = XGL_NULL_HANDLE;
     vs_stage.shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_SHADER_RESOURCE;
@@ -785,6 +789,10 @@
     ps_stage.shader.descriptorSetMapping[0].descriptorCount = 1;
     // TODO: Do we need a descriptor set mapping for fragment?
     ps_stage.shader.descriptorSetMapping[0].pDescriptorInfo = &ds_vs;
+    for (unsigned int i = 1; i < XGL_MAX_DESCRIPTOR_SETS; i++) {
+        ps_stage.shader.descriptorSetMapping[i].descriptorCount = 0;
+        ps_stage.shader.descriptorSetMapping[i].pDescriptorInfo = XGL_NULL_HANDLE;
+    }
     ps_stage.shader.linkConstBufferCount = 0;
     ps_stage.shader.pLinkConstBufferInfo = XGL_NULL_HANDLE;
     ps_stage.shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_SHADER_RESOURCE;