commit 283d7a689669008bc5500f18c374e3e9c47955e9
author Chia-I Wu <olv@lunarg.com> Sun Dec 28 15:43:42 2014 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:03 2015 -0700
tree 343d6a0b314acddac2e09543750bde047645f569
parent d28343cafd89c300d4d4302d30b23ac62a9862e0

tests: store XGL_GPU_MEMORYs in XglMemoryRefManager

XGL_GPU_MEMORY is already a pointer.

tests/xglrenderframework.cpp

diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index 830e9a0..1a79a1e 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -1063,11 +1063,11 @@
 }
 
 void XglMemoryRefManager::AddMemoryRef(XglConstantBufferObj *constantBuffer) {
-    m_bufferObjs.push_back(&constantBuffer->m_constantBufferMem);
+    m_bufferObjs.push_back(constantBuffer->m_constantBufferMem);
 }
 
 void XglMemoryRefManager::AddMemoryRef(XglTextureObj *texture) {
-    m_bufferObjs.push_back(&texture->m_textureMem);
+    m_bufferObjs.push_back(texture->m_textureMem);
 }
 
 XGL_MEMORY_REF* XglMemoryRefManager::GetMemoryRefList() {
@@ -1082,7 +1082,7 @@
     for (int i=0; i<numRefs; i++)
     {
         localRefs[i].flags = 0;
-        localRefs[i].mem = *m_bufferObjs[i];
+        localRefs[i].mem = m_bufferObjs[i];
     }
     return localRefs;
 }

tests/xglrenderframework.h

diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index 4818626..9851bb9 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -291,7 +291,7 @@
 
 protected:
     int m_numRefs;
-    vector<XGL_GPU_MEMORY*> m_bufferObjs;
+    vector<XGL_GPU_MEMORY> m_bufferObjs;
 
 };