tests:Better formatting between routines
diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index 3822ddc..0309cfe 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -227,6 +227,7 @@
xglCmdPrepareImages( m_cmdBuffer, 1, &transitionToRender );
m_renderTarget->state(( XGL_IMAGE_STATE ) transitionToClear.newState);
}
+
XglDescriptorSetObj::XglDescriptorSetObj(XglDevice *device)
{
m_device = device;
@@ -241,6 +242,7 @@
m_nextSlot++;
}
+
void XglDescriptorSetObj::AttachSampler(XglSamplerObj *sampler)
{
m_samplers.push_back(&sampler->m_sampler);
@@ -248,6 +250,7 @@
m_nextSlot++;
}
+
void XglDescriptorSetObj::AttachImageView(XglTextureObj *texture)
{
m_imageViews.push_back(&texture->m_textureViewInfo);
@@ -255,6 +258,7 @@
m_nextSlot++;
}
+
XGL_DESCRIPTOR_SLOT_INFO* XglDescriptorSetObj::GetSlotInfo(vector<int>slots,
vector<XGL_DESCRIPTOR_SET_SLOT_TYPE>types,
vector<XGL_OBJECT>objs )
@@ -342,6 +346,7 @@
// bind pipeline, vertex buffer (descriptor set) and WVP (dynamic memory view)
xglCmdBindDescriptorSet(commandBuffer, XGL_PIPELINE_BIND_POINT_GRAPHICS, 0, m_rsrcDescSet, 0 );
}
+
XglDescriptorSetObj::~XglDescriptorSetObj()
{
if (m_rsrcDescSet != XGL_NULL_HANDLE) xglDestroyObject(m_rsrcDescSet);
@@ -466,6 +471,7 @@
m_textureViewInfo.view = m_textureView;
}
+
XglTextureObj::~XglTextureObj()
{
if (m_texture != XGL_NULL_HANDLE) xglDestroyObject(m_texture);
@@ -514,6 +520,7 @@
assert(!err);
}
+
XglSamplerObj::~XglSamplerObj()
{
if (m_sampler != XGL_NULL_HANDLE) xglDestroyObject(m_sampler);
@@ -571,6 +578,7 @@
this->m_constantBufferView.format.numericFormat = XGL_NUM_FMT_FLOAT;
this->m_constantBufferView.state = XGL_MEMORY_STATE_DATA_TRANSFER;
}
+
XglConstantBufferObj::~XglConstantBufferObj()
{
if (m_constantBufferMem != XGL_NULL_HANDLE) xglFreeMemory(m_constantBufferMem);
@@ -739,6 +747,7 @@
m_memObjs.push_back((XGL_OBJECT) &constantBuffer->m_constantBufferView);
}
+
void XglShaderObj::BindShaderEntitySlotToImage(int slot, XGL_DESCRIPTOR_SET_SLOT_TYPE type, XglTextureObj *texture)
{
m_imageSlots.push_back(slot);
@@ -746,6 +755,7 @@
m_imageObjs.push_back((XGL_OBJECT) &texture->m_textureViewInfo);
}
+
void XglShaderObj::BindShaderEntitySlotToSampler(int slot, XglSamplerObj *sampler)
{
m_samplerSlots.push_back(slot);
@@ -753,6 +763,7 @@
m_samplerObjs.push_back(sampler->m_sampler);
}
+
XglShaderObj::XglShaderObj(XglDevice *device, const char * shader_code, XGL_PIPELINE_SHADER_STAGE stage, XglRenderFramework *framework)
{
XGL_RESULT err = XGL_SUCCESS;
@@ -798,10 +809,12 @@
assert(!err);
}
}
+
XglShaderObj::~XglShaderObj()
{
if (m_shader != XGL_NULL_HANDLE) xglDestroyObject(m_shader);
}
+
XglPipelineObj::XglPipelineObj(XglDevice *device)
{
XGL_RESULT err;
@@ -912,6 +925,7 @@
m_vertexBufferObjs[i]->Bind(m_cmdBuffer, m_vertexBufferObjs[i]->m_constantBufferView.offset, m_vertexBufferBindings[i]);
}
}
+
XglPipelineObj::~XglPipelineObj()
{
if (m_pipeline != XGL_NULL_HANDLE) xglDestroyObject(m_pipeline);
@@ -920,12 +934,15 @@
XglMemoryRefManager::XglMemoryRefManager() {
}
+
void XglMemoryRefManager::AddMemoryRef(XglConstantBufferObj *constantBuffer) {
m_bufferObjs.push_back(&constantBuffer->m_constantBufferMem);
}
+
void XglMemoryRefManager::AddMemoryRef(XglTextureObj *texture) {
m_bufferObjs.push_back(&texture->m_textureMem);
}
+
XGL_MEMORY_REF* XglMemoryRefManager::GetMemoryRefList() {
XGL_MEMORY_REF *localRefs;