commit 6ae4cfb52872d210dd57b232194fc76b003cda7b
author Chia-I Wu <olv@lunarg.com> Sun Dec 28 22:32:36 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:03 2015 -0700
tree 169e692425bb7fa916e3402d7ae49964542e7e04
parent a64266afa6c5a8a6464c3b8bd77bacb492aa70f5

tests: derive XglDescriptorSetObj from xgl_testing::DescriptorSet

tests/xglrenderframework.h

diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index 83fac99..35a9013 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -184,11 +184,10 @@
 
 };
 
-class XglDescriptorSetObj
+class XglDescriptorSetObj : public xgl_testing::DescriptorSet
 {
 public:
     XglDescriptorSetObj(XglDevice *device);
-    ~XglDescriptorSetObj();
     void AttachMemoryView(XglConstantBufferObj* constantBuffer);
     void AttachSampler( XglSamplerObj* sampler);
     void AttachImageView( XglTextureObj* texture);
@@ -199,9 +198,6 @@
     XGL_DESCRIPTOR_SLOT_INFO * GetSlotInfo(vector<int>slots, vector<XGL_DESCRIPTOR_SET_SLOT_TYPE>types, vector<void*>objs );
 
 protected:
-    XGL_DESCRIPTOR_SET_CREATE_INFO       m_descriptorInfo;
-    XGL_DESCRIPTOR_SET                   m_rsrcDescSet;
-    XGL_GPU_MEMORY                       m_descriptor_set_mem;
     XglDevice                           *m_device;
     XGL_DESCRIPTOR_SLOT_INFO            *m_slotInfo;
     int                                  m_nextSlot;