commit 824b7716e81acff715db433db774f97e4779d75b
author Tony Barbour <tony@LunarG.com> Thu Dec 18 17:06:21 2014 -0700
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Dec 19 17:59:38 2014 -0700
tree 738a020dd1f751d3bb8b6202953c747d21617424
parent ad8f154effb448fc997c0990da21ee368626c9bc

tests:Fix sampler bug + use total descSet slots in map

Conflicts:
	tests/xglrenderframework.h

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index d978fff..ab82c96 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -365,6 +365,11 @@
     return m_rsrcDescSet;
 }
 
+int XglDescriptorSetObj::GetTotalSlots()
+{
+    return m_nextSlot;
+}
+
 void XglDescriptorSetObj::BindCommandBuffer(XGL_CMD_BUFFER commandBuffer)
 {
     XGL_RESULT err;
@@ -790,7 +795,7 @@
     stageInfo->shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_UNUSED;
     stageInfo->shader.dynamicMemoryViewMapping.shaderEntityIndex = 0;
 
-    stageInfo->shader.descriptorSetMapping[0].descriptorCount = m_memSlots.size() + m_imageSlots.size() + m_samplerSlots.size();
+    stageInfo->shader.descriptorSetMapping[0].descriptorCount = descriptorSet->GetTotalSlots();
     if (stageInfo->shader.descriptorSetMapping[0].descriptorCount)
     {
         vector<int> allSlots;
@@ -846,7 +851,7 @@
 {
     m_samplerSlots.push_back(slot);
     m_samplerTypes.push_back(XGL_SLOT_SHADER_SAMPLER);
-    m_samplerObjs.push_back(sampler->m_sampler);
+    m_samplerObjs.push_back((XGL_OBJECT) &sampler->m_sampler);
 
 }