commit 714df45f6733792374ad4fcb6e0fef3b47fbeb89
author Chia-I Wu <olv@lunarg.com> Thu Jan 01 07:55:04 2015 +0800
committer Courtney Goeltzenleuchter <courtney@LunarG.com> Wed Feb 04 17:58:08 2015 -0700
tree c9747e482bcaef6e99e04be6b7debc951d0223b5
parent 691362cd3cb6923012e6dc953f518ff9336c1fd5

update for buffer object changes

tests/xglrenderframework.h

diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index f17ff4c..421f79d 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -116,7 +116,7 @@
     XGL_RESULT BeginCommandBuffer(XGL_RENDER_PASS renderpass_obj);
     XGL_RESULT BeginCommandBuffer();
     XGL_RESULT EndCommandBuffer();
-    void PrepareMemoryRegions(int transitionCount, XGL_MEMORY_STATE_TRANSITION *transitionPtr);
+    void PrepareBufferRegions(int transitionCount, XGL_BUFFER_STATE_TRANSITION *transitionPtr);
     void AddRenderTarget(XglImage *renderTarget);
     void AddDepthStencil();
     void ClearAllBuffers();
@@ -138,17 +138,19 @@
 
 };
 
-class XglConstantBufferObj : public xgl_testing::GpuMemory
+class XglConstantBufferObj : public xgl_testing::Buffer
 {
 public:
     XglConstantBufferObj(XglDevice *device);
     XglConstantBufferObj(XglDevice *device, int constantCount, int constantSize, const void* data);
-    void SetMemoryState(XGL_MEMORY_STATE newState);
+    void SetBufferState(XGL_BUFFER_STATE newState);
     void Bind(XGL_CMD_BUFFER cmdBuffer, XGL_GPU_SIZE offset, XGL_UINT binding);
-    XGL_MEMORY_VIEW_ATTACH_INFO     m_constantBufferView;
+
+    XGL_BUFFER_VIEW_ATTACH_INFO     m_bufferViewInfo;
 
 protected:
     XglDevice                      *m_device;
+    xgl_testing::BufferView         m_bufferView;
     int                             m_numVertices;
     int                             m_stride;
     XglCommandBufferObj             *m_commandBuffer;
@@ -258,7 +260,7 @@
 {
 public:
     XglDescriptorSetObj(XglDevice *device);
-    void AttachMemoryView(XglConstantBufferObj* constantBuffer);
+    void AttachBufferView(XglConstantBufferObj* constantBuffer);
     void AttachSampler( XglSamplerObj* sampler);
     void AttachImageView( XglTextureObj* texture);
     void BindCommandBuffer(XGL_CMD_BUFFER commandBuffer);
@@ -271,8 +273,8 @@
     XglDevice                           *m_device;
     XGL_DESCRIPTOR_SLOT_INFO            *m_slotInfo;
     int                                  m_nextSlot;
-    vector<int>                          m_memorySlots;
-    vector<XGL_MEMORY_VIEW_ATTACH_INFO*> m_memoryViews;
+    vector<int>                          m_bufferSlots;
+    vector<XGL_BUFFER_VIEW_ATTACH_INFO*> m_bufferViews;
     vector<int>                          m_samplerSlots;
     vector<XglSamplerObj*>               m_samplers;
     vector<int>                          m_imageSlots;
@@ -285,7 +287,7 @@
 public:
     XglShaderObj(XglDevice *device, const char * shaderText, XGL_PIPELINE_SHADER_STAGE stage, XglRenderFramework *framework);
     XGL_PIPELINE_SHADER_STAGE_CREATE_INFO* GetStageCreateInfo(XglDescriptorSetObj *descriptorSet);
-    void BindShaderEntitySlotToMemory(int slot, XGL_DESCRIPTOR_SET_SLOT_TYPE type, XglConstantBufferObj *constantBuffer);
+    void BindShaderEntitySlotToBuffer(int slot, XGL_DESCRIPTOR_SET_SLOT_TYPE type, XglConstantBufferObj *constantBuffer);
     void BindShaderEntitySlotToImage(int slot, XGL_DESCRIPTOR_SET_SLOT_TYPE type, XglTextureObj *texture);
     void BindShaderEntitySlotToSampler(int slot, XglSamplerObj *sampler);
 
@@ -293,9 +295,9 @@
     XGL_PIPELINE_SHADER_STAGE_CREATE_INFO stage_info;
     XGL_PIPELINE_SHADER_STAGE m_stage;
     XglDevice *m_device;
-    vector<int>    m_memSlots;
-    vector<XGL_DESCRIPTOR_SET_SLOT_TYPE> m_memTypes;
-    vector<XGL_MEMORY_VIEW_ATTACH_INFO*> m_memObjs;
+    vector<int>    m_bufferSlots;
+    vector<XGL_DESCRIPTOR_SET_SLOT_TYPE> m_bufferTypes;
+    vector<XGL_BUFFER_VIEW_ATTACH_INFO*> m_bufferObjs;
     vector<int>    m_samplerSlots;
     vector<XGL_DESCRIPTOR_SET_SLOT_TYPE> m_samplerTypes;
     vector<XglSamplerObj*> m_samplerObjs;