tests:Remove unused code
diff --git a/tests/render_tests.cpp b/tests/render_tests.cpp
index 6a7b1c6..c464896 100644
--- a/tests/render_tests.cpp
+++ b/tests/render_tests.cpp
@@ -425,36 +425,6 @@
void XglRenderTest::GenerateClearAndPrepareBufferCmds()
{
XglRenderFramework::GenerateClearAndPrepareBufferCmds();
-
- if (0) {
-// if (m_depthStencilImage) {
- XGL_IMAGE_SUBRESOURCE_RANGE dsRange = {};
- dsRange.aspect = XGL_IMAGE_ASPECT_DEPTH;
- dsRange.baseMipLevel = 0;
- dsRange.mipLevels = XGL_LAST_MIP_OR_SLICE;
- dsRange.baseArraySlice = 0;
- dsRange.arraySize = XGL_LAST_MIP_OR_SLICE;
-
- // prepare the depth buffer for clear
- XGL_IMAGE_STATE_TRANSITION transitionToClear = {};
- transitionToClear.image = m_depthStencilImage;
- transitionToClear.oldState = m_depthStencilBinding.depthState;
- transitionToClear.newState = XGL_IMAGE_STATE_CLEAR;
- transitionToClear.subresourceRange = dsRange;
- xglCmdPrepareImages( m_cmdBuffer, 1, &transitionToClear );
- m_renderTarget->state(( XGL_IMAGE_STATE ) transitionToClear.newState);
-
- xglCmdClearDepthStencil(m_cmdBuffer, m_depthStencilImage, 1.0f, 0, 1, &dsRange);
-
- // prepare depth buffer for rendering
- XGL_IMAGE_STATE_TRANSITION transitionToRender = {};
- transitionToRender.image = m_renderTarget->image();
- transitionToRender.oldState = XGL_IMAGE_STATE_CLEAR;
- transitionToRender.newState = m_depthStencilBinding.depthState;
- transitionToRender.subresourceRange = dsRange;
- xglCmdPrepareImages( m_cmdBuffer, 1, &transitionToRender );
- m_renderTarget->state(( XGL_IMAGE_STATE ) transitionToClear.newState);
- }
}
diff --git a/tests/xglrenderframework.cpp b/tests/xglrenderframework.cpp
index df28289..3822ddc 100644
--- a/tests/xglrenderframework.cpp
+++ b/tests/xglrenderframework.cpp
@@ -53,12 +53,6 @@
{
XGL_RESULT err;
- memset(&m_vtxBufferView, 0, sizeof(m_vtxBufferView));
- m_vtxBufferView.sType = XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO;
-
- memset(&m_constantBufferView, 0, sizeof(m_constantBufferView));
- m_constantBufferView.sType = XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO;
-
err = xglInitAndEnumerateGpus(&app_info, NULL,
MAX_GPUS, &this->gpu_count, objs);
ASSERT_XGL_SUCCESS(err);
@@ -146,157 +140,6 @@
ASSERT_XGL_SUCCESS(err) << "xglCreateCommandBuffer failed";
}
-void XglRenderFramework::InitConstantBuffer(int constantCount, int constantSize,
- const void* data)
-{
- XGL_RESULT err = XGL_SUCCESS;
-
- XGL_MEMORY_ALLOC_INFO alloc_info = {};
- XGL_UINT8 *pData;
-
- alloc_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
- alloc_info.allocationSize = constantCount * constantSize;
- alloc_info.alignment = 0;
- alloc_info.heapCount = 1;
- alloc_info.heaps[0] = 0; // TODO: Use known existing heap
-
- alloc_info.flags = XGL_MEMORY_HEAP_CPU_VISIBLE_BIT;
- alloc_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
-
- err = xglAllocMemory(device(), &alloc_info, &m_constantBufferMem);
- ASSERT_XGL_SUCCESS(err);
-
- err = xglMapMemory(m_constantBufferMem, 0, (XGL_VOID **) &pData);
- ASSERT_XGL_SUCCESS(err);
-
- memcpy(pData, data, alloc_info.allocationSize);
-
- err = xglUnmapMemory(m_constantBufferMem);
- ASSERT_XGL_SUCCESS(err);
-
- // set up the memory view for the constant buffer
- this->m_constantBufferView.stride = 16;
- this->m_constantBufferView.range = alloc_info.allocationSize;
- this->m_constantBufferView.offset = 0;
- this->m_constantBufferView.mem = m_constantBufferMem;
- this->m_constantBufferView.format.channelFormat = XGL_CH_FMT_R32G32B32A32;
- this->m_constantBufferView.format.numericFormat = XGL_NUM_FMT_FLOAT;
-}
-
-/*
- * Update existing constant value with new data of exactly
- * the same size.
- */
-void XglRenderFramework::UpdateConstantBuffer(const void* data)
-{
- XGL_RESULT err = XGL_SUCCESS;
- XGL_UINT8 *pData;
-
- err = xglMapMemory(m_constantBufferMem, 0, (XGL_VOID **) &pData);
- ASSERT_XGL_SUCCESS(err);
-
- memcpy(pData + this->m_constantBufferView.offset, data, this->m_constantBufferView.range);
-
- err = xglUnmapMemory(m_constantBufferMem);
- ASSERT_XGL_SUCCESS(err);
-}
-
-void XglRenderFramework::CreateQueryPool(XGL_QUERY_TYPE type, XGL_UINT slots,
- XGL_QUERY_POOL *pPool, XGL_GPU_MEMORY *pMem)
-{
- XGL_RESULT err;
-
- XGL_QUERY_POOL_CREATE_INFO poolCreateInfo = {};
- poolCreateInfo.sType = XGL_STRUCTURE_TYPE_QUERY_POOL_CREATE_INFO;
- poolCreateInfo.pNext = NULL;
- poolCreateInfo.queryType = type;
- poolCreateInfo.slots = slots;
-
- err = xglCreateQueryPool(device(), &poolCreateInfo, pPool);
- ASSERT_XGL_SUCCESS(err);
-
- XGL_MEMORY_REQUIREMENTS mem_req;
- XGL_UINT data_size = sizeof(mem_req);
- err = xglGetObjectInfo(*pPool, XGL_INFO_TYPE_MEMORY_REQUIREMENTS,
- &data_size, &mem_req);
- ASSERT_XGL_SUCCESS(err);
- ASSERT_EQ(data_size, sizeof(mem_req));
-
- if (!mem_req.size) {
- *pMem = XGL_NULL_HANDLE;
- return;
- }
-
- XGL_MEMORY_ALLOC_INFO mem_info;
-
- memset(&mem_info, 0, sizeof(mem_info));
- mem_info.sType = XGL_STRUCTURE_TYPE_MEMORY_ALLOC_INFO;
- mem_info.allocationSize = mem_req.size;
- mem_info.alignment = mem_req.alignment;
- mem_info.heapCount = mem_req.heapCount;
- memcpy(mem_info.heaps, mem_req.heaps, sizeof(XGL_UINT)*XGL_MAX_MEMORY_HEAPS);
- mem_info.memPriority = XGL_MEMORY_PRIORITY_NORMAL;
- mem_info.flags = XGL_MEMORY_ALLOC_SHAREABLE_BIT;
- err = xglAllocMemory(device(), &mem_info, pMem);
- ASSERT_XGL_SUCCESS(err);
-
- err = xglBindObjectMemory(*pPool, *pMem, 0);
- ASSERT_XGL_SUCCESS(err);
-}
-
-void XglRenderFramework::DestroyQueryPool(XGL_QUERY_POOL pool, XGL_GPU_MEMORY mem)
-{
- ASSERT_XGL_SUCCESS(xglBindObjectMemory(pool, XGL_NULL_HANDLE, 0));
- ASSERT_XGL_SUCCESS(xglFreeMemory(mem));
- ASSERT_XGL_SUCCESS(xglDestroyObject(pool));
-}
-
-void XglRenderFramework::CreateShader(XGL_PIPELINE_SHADER_STAGE stage,
- const char *shader_code,
- XGL_SHADER *pshader)
-{
- XGL_RESULT err = XGL_SUCCESS;
- std::vector<unsigned int> bil;
- XGL_SHADER_CREATE_INFO createInfo;
- size_t shader_len;
- XGL_SHADER shader;
-
- createInfo.sType = XGL_STRUCTURE_TYPE_SHADER_CREATE_INFO;
- createInfo.pNext = NULL;
-
- if (!this->m_use_bil) {
- shader_len = strlen(shader_code);
- createInfo.codeSize = 3 * sizeof(uint32_t) + shader_len + 1;
- createInfo.pCode = malloc(createInfo.codeSize);
- createInfo.flags = 0;
-
- /* try version 0 first: XGL_PIPELINE_SHADER_STAGE followed by GLSL */
- ((uint32_t *) createInfo.pCode)[0] = ICD_BIL_MAGIC;
- ((uint32_t *) createInfo.pCode)[1] = 0;
- ((uint32_t *) createInfo.pCode)[2] = stage;
- memcpy(((uint32_t *) createInfo.pCode + 3), shader_code, shader_len + 1);
-
- err = xglCreateShader(device(), &createInfo, &shader);
- if (err) {
- free((void *) createInfo.pCode);
- }
- }
-
- // Only use BIL if GLSL compile fails or it's requested via m_use_bil
- if (this->m_use_bil || err) {
- // Use Reference GLSL to BIL compiler
- GLSLtoBIL(stage, shader_code, bil);
- createInfo.pCode = bil.data();
- createInfo.codeSize = bil.size() * sizeof(unsigned int);
- createInfo.flags = 0;
- err = xglCreateShader(device(), &createInfo, &shader);
- }
-
- ASSERT_XGL_SUCCESS(err);
-
- *pshader = shader;
-}
-
void XglRenderFramework::InitViewport(float width, float height)
{
XGL_RESULT err;
@@ -342,24 +185,6 @@
}
}
-void XglRenderFramework::GenerateBindStateAndPipelineCmds(XGL_PIPELINE* pipeline)
-{
- // set all states
- xglCmdBindStateObject( m_cmdBuffer, XGL_STATE_BIND_RASTER, m_stateRaster );
- xglCmdBindStateObject( m_cmdBuffer, XGL_STATE_BIND_VIEWPORT, m_stateViewport );
- xglCmdBindStateObject( m_cmdBuffer, XGL_STATE_BIND_COLOR_BLEND, m_colorBlend);
- xglCmdBindStateObject( m_cmdBuffer, XGL_STATE_BIND_DEPTH_STENCIL, m_stateDepthStencil );
- xglCmdBindStateObject( m_cmdBuffer, XGL_STATE_BIND_MSAA, m_stateMsaa );
-
- // bind pipeline and WVP (dynamic memory view)
- xglCmdBindPipeline( m_cmdBuffer, XGL_PIPELINE_BIND_POINT_GRAPHICS, *pipeline );
-
- // bind pipeline and WVP (dynamic memory view)
- xglCmdBindDescriptorSet(m_cmdBuffer, XGL_PIPELINE_BIND_POINT_GRAPHICS, 0, m_rsrcDescSet, 0 );
-
- xglCmdBindVertexData(m_cmdBuffer, m_vtxBufferView.mem, m_vtxBufferView.offset, 0);
-}
-
void XglRenderFramework::GenerateBindStateAndPipelineCmds()
{
// set all states
diff --git a/tests/xglrenderframework.h b/tests/xglrenderframework.h
index 55e1569..962b3f1 100644
--- a/tests/xglrenderframework.h
+++ b/tests/xglrenderframework.h
@@ -36,17 +36,8 @@
XglRenderFramework();
~XglRenderFramework();
- void CreateQueryPool(XGL_QUERY_TYPE type, XGL_UINT slots,
- XGL_QUERY_POOL *pPool, XGL_GPU_MEMORY *pMem);
- void DestroyQueryPool(XGL_QUERY_POOL pool, XGL_GPU_MEMORY mem);
-
XGL_DEVICE device() {return m_device->device();}
XGL_PHYSICAL_GPU gpu() {return objs[0];}
- void CreateShader(XGL_PIPELINE_SHADER_STAGE stage, const char *shader_code, XGL_SHADER *pshader);
- void InitPipeline();
- void InitMesh( XGL_UINT32 numVertices, XGL_GPU_SIZE vbStride, const void* vertices );
- void InitConstantBuffer( int constantCount, int constantSize, const void* data );
- void UpdateConstantBuffer(const void* data);
void InitViewport(float width, float height);
void InitViewport();
void InitRenderTarget();
@@ -55,7 +46,6 @@
void InitState();
void GenerateClearAndPrepareBufferCmds();
void GenerateBindRenderTargetCmd();
- void GenerateBindStateAndPipelineCmds(XGL_PIPELINE* pipeline);
void GenerateBindStateAndPipelineCmds();
@@ -63,23 +53,14 @@
XGL_APPLICATION_INFO app_info;
XGL_PHYSICAL_GPU objs[MAX_GPUS];
XGL_UINT gpu_count;
- XGL_GPU_MEMORY m_descriptor_set_mem;
- XGL_GPU_MEMORY m_pipe_mem;
XglDevice *m_device;
XGL_CMD_BUFFER m_cmdBuffer;
- XGL_UINT32 m_numVertices;
- XGL_MEMORY_VIEW_ATTACH_INFO m_vtxBufferView;
- XGL_MEMORY_VIEW_ATTACH_INFO m_constantBufferView;
- XGL_GPU_MEMORY m_vtxBufferMem;
- XGL_GPU_MEMORY m_constantBufferMem;
- XGL_UINT32 m_numMemRefs;
XGL_MEMORY_REF m_memRefs[5];
XGL_RASTER_STATE_OBJECT m_stateRaster;
XGL_COLOR_BLEND_STATE_OBJECT m_colorBlend;
XGL_VIEWPORT_STATE_OBJECT m_stateViewport;
XGL_DEPTH_STENCIL_STATE_OBJECT m_stateDepthStencil;
XGL_MSAA_STATE_OBJECT m_stateMsaa;
- XGL_DESCRIPTOR_SET m_rsrcDescSet;
XglImage *m_renderTarget;
XGL_FLOAT m_width, m_height;
XGL_FORMAT m_render_target_fmt;
@@ -101,12 +82,6 @@
this->app_info.engineVersion = 1;
this->app_info.apiVersion = XGL_MAKE_VERSION(0, 22, 0);
- memset(&m_vtxBufferView, 0, sizeof(m_vtxBufferView));
- m_vtxBufferView.sType = XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO;
-
- memset(&m_constantBufferView, 0, sizeof(m_constantBufferView));
- m_constantBufferView.sType = XGL_STRUCTURE_TYPE_MEMORY_VIEW_ATTACH_INFO;
-
err = xglInitAndEnumerateGpus(&app_info, NULL,
MAX_GPUS, &this->gpu_count, objs);
ASSERT_XGL_SUCCESS(err);