commit f5d81872bb94f0016656bfae44639aa252be489a
author Chia-I Wu <olv@lunarg.com> Mon Dec 29 14:24:14 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:03 2015 -0700
tree b852c4d867182d6b4470531c7adffdff9479c221
parent c2c3108b1fb931b928fe75e9237b17ea3a02902d

tests: derive XglPipelineObj from xgl_testing::Pipeline

tests/xglrenderframework.h

diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index 79072d0..a89a033 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -235,11 +235,10 @@
 
 };
 
-class XglPipelineObj
+class XglPipelineObj : public xgl_testing::Pipeline
 {
 public:
     XglPipelineObj(XglDevice *device);
-    ~XglPipelineObj();
     void BindPipelineCommandBuffer(XGL_CMD_BUFFER m_cmdBuffer, XglDescriptorSetObj *descriptorSet);
     void AddShader(XglShaderObj* shaderObj);
     void AddVertexInputAttribs(XGL_VERTEX_INPUT_ATTRIBUTE_DESCRIPTION* vi_attrib, int count);
@@ -250,13 +249,11 @@
     XGL_PIPELINE GetPipelineHandle();
 
 protected:
-    XGL_PIPELINE m_pipeline;
     XGL_PIPELINE_VERTEX_INPUT_CREATE_INFO m_vi_state;
     XGL_PIPELINE_IA_STATE_CREATE_INFO m_ia_state;
     XGL_PIPELINE_RS_STATE_CREATE_INFO m_rs_state;
     XGL_PIPELINE_CB_STATE m_cb_state;
     XGL_PIPELINE_DB_STATE_CREATE_INFO m_db_state;
-    XGL_GPU_MEMORY m_pipe_mem;
     XglDevice *m_device;
     vector<XglShaderObj*> m_shaderObjs;
     vector<XglConstantBufferObj*> m_vertexBufferObjs;