commit 619ab2b69c3b4a4624982b881497a617c9e71ea4
author Chia-I Wu <olvaffe@gmail.com> Sat Aug 23 17:47:45 2014 +0800
committer Chia-I Wu <olvaffe@gmail.com> Sat Aug 23 17:50:19 2014 +0800
tree 233d741b89a2b426e7d295a9600d14e6c3c53580
parent 0246188b3b31cfd39b4456189ee1d4d20e87f037

render_test: no descriptor set nor dynamic view mapping

tests/render_tests.cpp

diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 0ed25ba..b9cf4dc 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -532,13 +532,6 @@
     xglAttachMemoryViewDescriptors( m_rsrcDescSet, 0, 1, &m_vtxBufferView );
     xglEndDescriptorSetUpdate( m_rsrcDescSet );
 #endif
-    /*
-     * Define descriptor slots for vertex shader.
-     */
-    XGL_DESCRIPTOR_SLOT_INFO ds_vs = {
-        XGL_SLOT_SHADER_RESOURCE,    // XGL_DESCRIPTOR_SET_SLOT_TYPE
-        1                            // shaderEntityIndex
-    };
 
     ASSERT_NO_FATAL_FAILURE(CreateShader("vs-kernel.bin", &vs));
 
@@ -546,11 +539,10 @@
     vs_stage.pNext = XGL_NULL_HANDLE;
     vs_stage.shader.stage = XGL_SHADER_STAGE_VERTEX;
     vs_stage.shader.shader = vs;
-    vs_stage.shader.descriptorSetMapping[0].descriptorCount = 1;
-    vs_stage.shader.descriptorSetMapping[0].pDescriptorInfo = &ds_vs;
+    vs_stage.shader.descriptorSetMapping[0].descriptorCount = 0;
     vs_stage.shader.linkConstBufferCount = 0;
     vs_stage.shader.pLinkConstBufferInfo = XGL_NULL_HANDLE;
-    vs_stage.shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_SHADER_RESOURCE;
+    vs_stage.shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_UNUSED;
     vs_stage.shader.dynamicMemoryViewMapping.shaderEntityIndex = 0;
 
     ASSERT_NO_FATAL_FAILURE(CreateShader("wm-kernel.bin", &ps));
@@ -559,12 +551,11 @@
     ps_stage.pNext = &vs_stage;
     ps_stage.shader.stage = XGL_SHADER_STAGE_FRAGMENT;
     ps_stage.shader.shader = ps;
-    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;
+    ps_stage.shader.descriptorSetMapping[0].descriptorCount = 0;
     ps_stage.shader.linkConstBufferCount = 0;
     ps_stage.shader.pLinkConstBufferInfo = XGL_NULL_HANDLE;
-    ps_stage.shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_SHADER_RESOURCE;
+    ps_stage.shader.dynamicMemoryViewMapping.slotObjectType = XGL_SLOT_UNUSED;
     ps_stage.shader.dynamicMemoryViewMapping.shaderEntityIndex = 0;
 
     XGL_PIPELINE_IA_STATE_CREATE_INFO ia_state = {